From ec8cbd68a6644ed3fc526c18af7aa85552a14d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= Date: Mon, 23 Oct 2023 17:45:48 -0300 Subject: [PATCH] Revert "ci: drop extra paths" This reverts commit 3f401b03702b51b3cd70626b30af1ce4c78f28a8. --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2737a9584..fe7c408a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,11 +108,16 @@ jobs: - name: Build Dependencies run: | export PATH="$HASKELL_PATHS:$PATH" - stack build --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib --only-dependencies + stack build --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib --only-dependencies $EXTRA_ARGS_WIN + env: + EXTRA_ARGS_WIN: ${{ (runner.os == 'Windows' && ' --extra-include-dirs=C:/msys64/clang64/include --extra-lib-dirs=C:/msys64/clang64/lib') || '' }} + - name: Build and install echidna run: | export PATH="$HASKELL_PATHS:$PATH" - stack install --flag echidna:static --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib + stack install --flag echidna:static --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib $EXTRA_ARGS_WIN + env: + EXTRA_ARGS_WIN: ${{ (runner.os == 'Windows' && ' --extra-include-dirs=C:/msys64/clang64/include --extra-lib-dirs=C:/msys64/clang64/lib') || '' }} - name: Amend and compress binaries (macOS) if: runner.os == 'macOS'