From 742ab2b51efc4331a96e6b1b6d32d4cc09a9f73d Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 20 Dec 2024 12:10:55 +0800 Subject: [PATCH] Use ghcup action --- .github/workflows/test.yaml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e5371a9f..a2a09364 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,10 +17,10 @@ jobs: 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-12 + - os: macos-13 ghc: '9.4' cabal: '3.8.1.0' - - os: macos-12 + - os: macos-13 ghc: '9.6' cabal: '3.8.1.0' - os: windows-latest @@ -32,11 +32,13 @@ jobs: steps: - uses: actions/checkout@v3 + - uses: haskell/ghcup-setup@v1 + - name: Install dependencies (Ubuntu) if: runner.os == 'Linux' run: | sudo apt-get -y update - sudo apt-get -y install libtinfo5 libtinfo6 libncurses5 libncurses6 + sudo apt-get -y install libtinfo6 libncurses6 - name: Install ghc/cabal run: | @@ -134,6 +136,8 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - uses: haskell/ghcup-setup@v1 + - name: Run build run: | bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake @@ -144,7 +148,9 @@ jobs: export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar" export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib" . .github/scripts/env.sh - 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 + ghcup install ghc --set ${{ matrix.ghc }} + ghcup install cabal --set latest + cabal update cabal test cabal bench env: @@ -164,10 +170,14 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - uses: haskell/ghcup-setup@v1 + - name: Run build run: | - pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 + sudo pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake llvm14 . .github/scripts/env.sh - 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 + ghcup install ghc --set ${{ matrix.ghc }} + ghcup install cabal --set recommended + cabal update cabal test cabal bench