fixup! ci: fix GHC 9.4 support on Windows

crytic · Oct 24, 2023 · ae6964f · ae6964f
1 parent c5063e8
commit ae6964f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,9 +74,7 @@ jobs:
         run: |
           HOME="${{ (runner.os == 'Windows' && '$(cygpath -m ~)') || '$HOME' }}"
           mkdir -p "$STACK_ROOT"
-          { cat /etc/stack/config.yaml 2>/dev/null || true;
-            echo;
-            echo "extra-include-dirs:";
+          { echo "extra-include-dirs:";
             echo "- $HOME/.local/include";
             echo "$EXTRA_INCLUDE_WIN";
             echo;
@@ -91,7 +89,7 @@ jobs:
             "$SKIP_MSYS" && echo "skip-msys: true" || true
           } >> "$STACK_ROOT/config.yaml"
           cat "$STACK_ROOT/config.yaml"
-          echo "STACK_ROOT=${STACK_ROOT/#\~/$HOME}" >> "$GITHUB_ENV"
+          echo "STACK_CONFIG=${STACK_ROOT/#\~/$HOME}/config.yaml" >> "$GITHUB_ENV"
         env:
           STACK_ROOT: ${{ steps.stack.outputs.stack-root || '~/.stack' }}
           EXTRA_INCLUDE_WIN: ${{ (runner.os == 'Windows' && '- C:/msys64/clang64/include') || '' }}