Merge pull request #1353 from crytic/fix-ci-ubuntu

ci: use `ubuntu-latest`, fix Windows headers include order
crytic · Mar 5, 2025 · 9a01d8f · 9a01d8f
2 parents 892dab2 + d84aae6
commit 9a01d8f
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             shell: bash
             container: "{\"image\": \"elopeztob/alpine-haskell-stack-echidna:ghc-9.6.5\", \"options\": \"--user 1001\"}"
           - os: macos-13 # x86_64 macOS
@@ -74,11 +74,6 @@ jobs:
           GHC_MINGW_PATH="${{ (runner.os == 'Windows' && '$(cygpath -m "$GHC_BIN_PATH/../mingw")') || '' }}"
           mkdir -p "$STACK_ROOT"
           { echo "extra-include-dirs:";
-            if [ ! "$GHC_MINGW_PATH" = "" ]; then
-              echo "- $GHC_MINGW_PATH/x86_64-w64-mingw32/include";
-              echo "- $GHC_MINGW_PATH/include";
-              echo "- D:/a/_temp/msys64/clang64/include";
-            fi;
             echo "- $HOME/.local/include";
             echo;
             echo "extra-lib-dirs:";
@@ -91,7 +86,7 @@ jobs:
             echo;
             echo "ghc-options:";
             echo '  "$locals": -Werror'
-            "$REPLACE_LINKER_WIN" && echo '  "$everything": -pgml='$(cygpath -m "$GHC_MINGW_PATH/bin/clang.exe");
+            "$REPLACE_LINKER_WIN" && echo '  "$everything": -pgml='$(cygpath -m "$GHC_MINGW_PATH/bin/clang.exe") -optc-idirafter -optc'D:/a/_temp/msys64/clang64/include' -optcxx-idirafter -optcxx'D:/a/_temp/msys64/clang64/include';
             echo;
             "$SKIP_MSYS" && echo "skip-msys: true" || true
             echo "system-ghc: true";