diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 834d39c5fd..238f9a1c25 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,11 +24,23 @@ jobs:
         ]
     name: ${{ matrix.msystem }}
     runs-on: ${{ matrix.runner }}
+    env:
+      MSYS: winjitdebug
     steps:
       - name: Get CPU Name
         run : |
           Get-CIMInstance -Class Win32_Processor | Select-Object -Property Name
 
+      - name: Setup JIT minidump
+        if: ${{ matrix.msystem != 'CLANGARM64' }}
+        run: |
+          Set-Location '${{ runner.temp }}'
+          Invoke-WebRequest -Uri 'https://download.sysinternals.com/files/Procdump.zip' -OutFile Procdump.zip
+          Expand-Archive Procdump.zip -DestinationPath .
+          New-Item -Path '_dumps' -ItemType Directory
+          .\procdump64.exe -accepteula -ma -i "${{ runner.temp }}/_dumps"
+          .\procdump.exe -accepteula -ma -i "${{ runner.temp }}/_dumps"
+
       - uses: actions/checkout@v3
         with:
           path: temp
@@ -81,10 +93,20 @@ jobs:
           MINGW_ARCH=${{ matrix.msystem }} ./.ci/ci-build.sh
 
       - name: "Upload binaries"
+        if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.msystem }}-packages
           path: C:/_/artifacts/*.pkg.tar.*
+          if-no-files-found: ignore
+
+      - name: "Upload dumps"
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.msystem }}-dumps
+          path: ${{ runner.temp }}/_dumps/*.dmp
+          if-no-files-found: ignore
 
       - name: "Clean up runner"
         if: ${{ always() }}