From c3c51da121752fe2bc666a6bbfa11f5a6e8fc65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= Date: Mon, 26 Aug 2024 17:26:47 +0200 Subject: [PATCH] ci: use clean msys2 environment --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0718518ea..3b8fd71c7 100644 --- 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,7 +82,7 @@ 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/msys64/clang64/bin/clang.exe -pgml-supports-no-pie' || echo; echo; "$SKIP_MSYS" && echo "skip-msys: true" || true echo "system-ghc: true"; @@ -93,8 +92,8 @@ jobs: 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/msys64/clang64/include') || '' }} + EXTRA_LIB_WIN: ${{ (runner.os == 'Windows' && '- D:/a/_temp/msys64/clang64/lib') || '' }} REPLACE_LINKER_WIN: ${{ (runner.os == 'Windows' && 'true') || 'false' }} SKIP_MSYS: ${{ (runner.os == 'Windows' && 'true') || 'false' }} @@ -116,7 +115,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