From de7d6849c0b3b831f998f3b90b17e0af533729ec Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 4 Apr 2024 19:14:23 +1100 Subject: [PATCH] wip --- .github/workflows/haskell.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 9bf7105a069..a064f6c777e 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -35,6 +35,10 @@ jobs: - os: macos-latest cabal: "3.10.2.1" ghc: "9.6.4" + sys: + - { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' } + - { os: ubuntu-latest, shell: bash } + - { os: macos-latest, shell: bash} env: # Modify this value to "invalidate" the cabal cache. @@ -96,9 +100,6 @@ jobs: - name: Record dependencies id: record-deps run: | - # The tests call out to msys2 commands. We generally do not want to mix toolchains, so - # we are very deliberate about only adding msys64 to the path where absolutely necessary. - ${{ (runner.os == 'Windows' && '$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)') || '' }} cat dist-newstyle/cache/plan.json | jq -r '."install-plan" | select(.style != "local") | .id' | sort | uniq > dependencies.txt # From the dependency list we restore the cached dependencies.