From 6ab4523d0e1671d8a4c6232f57833558ed7d3497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= Date: Tue, 24 Oct 2023 14:25:29 -0300 Subject: [PATCH] ci: windows: use default msys2 installation path --- .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 6f1905c90..1aa22c09e 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,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