From a9749daa6f2ba19f9cb74d84e9342c80ca39f9a5 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 1 May 2024 16:09:46 +0800 Subject: [PATCH] Fix macOS CI --- .github/workflows/test.yaml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0ba89aa..d20f6db 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,28 +17,22 @@ jobs: matrix: os: [ubuntu-latest] ghc: ['8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8'] - cabal: ['3.8.1.0'] include: - os: macOS-latest ghc: '9.4' - cabal: '3.10.2.1' - os: macOS-latest ghc: '9.6' - cabal: '3.10.2.1' - os: macOS-latest ghc: '9.8' - cabal: '3.10.2.1' - os: windows-latest ghc: '9.4' - cabal: '3.10.2.1' - os: windows-latest ghc: '9.6' - cabal: '3.10.2.1' - os: windows-latest ghc: '9.8' - cabal: '3.10.2.1' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Install dependencies (Ubuntu) if: runner.os == 'Linux' @@ -46,16 +40,15 @@ jobs: sudo apt-get -y update sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6 - - name: Install ghc/cabal + - if: runner.os != 'Windows' + name: Setup toolchain run: | - set -eux - ghcup install ghc --set ${{ matrix.ghc }} - ghcup install cabal ${{ matrix.cabal }} - shell: bash + curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh - name: Build run: | set -eux + [ -e ~/.ghcup/env ] && . ~/.ghcup/env echo ${{ matrix.ghc }} echo $(ghc --numeric-version) cabal update