ci: windows: use default msys2 installation path

crytic · Oct 24, 2023 · 5293768 · 5293768
1 parent d8fb998
commit 5293768
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,6 @@ jobs:
         if: runner.os == 'Windows'
         with:
           msystem: CLANG64
-          release: false
           path-type: minimal
           update: true
           install: >-
@@ -83,15 +82,15 @@ jobs:
             echo;
             echo "ghc-options:";
             echo -n '  "$locals": -Werror'
-            "$REPLACE_LINKER_WIN" && echo ' -pgml=C:/msys64/clang64/bin/clang.exe -pgml-supports-no-pie' || echo;
+            "$REPLACE_LINKER_WIN" && echo ' -pgml=D:/a/_temp/clang64/bin/clang.exe -pgml-supports-no-pie' || echo;
             echo;
             "$SKIP_MSYS" && echo "skip-msys: true" || true
           } >> "$STACK_ROOT/config.yaml"
           cat "$STACK_ROOT/config.yaml"
         env:
           STACK_ROOT: ${{ steps.stack.outputs.stack-root || '/etc/stack' }}
-          EXTRA_INCLUDE_WIN: ${{ (runner.os == 'Windows' && '- C:/msys64/clang64/include') || '' }}
-          EXTRA_LIB_WIN: ${{ (runner.os == 'Windows' && '- C:/msys64/clang64/lib') || '' }}
+          EXTRA_INCLUDE_WIN: ${{ (runner.os == 'Windows' && '- D:/a/_temp/clang64/include') || '' }}
+          EXTRA_LIB_WIN: ${{ (runner.os == 'Windows' && '- D:/a/_temp/clang64/lib') || '' }}
           REPLACE_LINKER_WIN: ${{ (runner.os == 'Windows' && 'true') || 'false' }}
           SKIP_MSYS: ${{ (runner.os == 'Windows' && 'true') || 'false' }}
 
@@ -113,7 +112,7 @@ jobs:
         with:
           path: |
             ~/.local
-            C:\msys64\home\runneradmin\.local
+            D:\a\_temp\msys64\home\runneradmin\.local
           key: ${{ runner.os }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
 
       - name: Cache Stack & Cabal
@@ -125,6 +124,7 @@ jobs:
             ${{ steps.stack.outputs.stack-root || '~/.stack' }}/*
             !${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar
             !${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar.gz
+            !${{ steps.stack.outputs.stack-root || '~/.stack' }}/config.yaml
           key: ${{ runner.os }}-stack-${{ env.CACHE_VERSION }}-${{ hashFiles('package.yaml', 'stack.yaml') }}
 
       - name: Build Libraries