diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1bf718b6070..dfa3be2c645 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -25,12 +25,6 @@ jobs: echo "BINARY_CACHE_THREADS: $BINARY_CACHE_THREADS" echo "BINARY_CACHE_URI: $BINARY_CACHE_URI" - - uses: msys2/setup-msys2@v2 - if: matrix.os == 'windows-latest' - with: - update: true - install: autoconf - - uses: actions/setup-haskell@v1 id: setup-haskell with: @@ -75,25 +69,14 @@ jobs: - name: Select build directory run: echo "::set-output name=CABAL_BUILDDIR::dist" - - name: Install dependencies (Posix) + - name: Install dependencies if: matrix.os != 'windows-latest' run: cabal build all --builddir dist --enable-tests --enable-benchmarks --write-ghc-environment-files=always --only-dependencies - - name: Install dependencies (Windows) - if: matrix.os == 'windows-latest' - run: | - echo "Path bash: $PATH" - msys2 -c 'echo "Path msys2: $PATH"' - msys2 -c "cabal build all --builddir dist --enable-tests --enable-benchmarks --write-ghc-environment-files=always --only-dependencies" - - - name: Build (Posix) + - name: Build if: matrix.os != 'windows-latest' run: cabal build all --builddir dist --enable-tests --enable-benchmarks --write-ghc-environment-files=always - - name: Build (Windows) - if: matrix.os == 'windows-latest' - run: msys2 -c "cabal build all --builddir dist --enable-tests --enable-benchmarks --write-ghc-environment-files=always" - - name: Save cabal cache uses: haskell-works/cabal-cache-action@v1 if: ${{ always() }}