diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index cf62a58..562b9f8 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -6,11 +6,11 @@ # # haskell-ci regenerate # -# For more information, see https://github.com/haskell-CI/haskell-ci +# For more information, see https://github.com/arybczak/haskell-ci # -# version: 0.19.20251105 +# version: 0.19.20260721 # -# REGENDATA ("0.19.20251105",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.19.20260721",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -23,6 +23,11 @@ on: merge_group: branches: - master + workflow_dispatch: + {} +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -30,14 +35,14 @@ jobs: timeout-minutes: 60 container: - image: buildpack-deps:jammy + image: buildpack-deps:resolute continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.12.2 + - compiler: ghc-9.12.4 compilerKind: ghc - compilerVersion: 9.12.2 + compilerVersion: 9.12.4 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.3 @@ -55,7 +60,7 @@ jobs: - name: apt-get install run: | apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" @@ -63,8 +68,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -117,9 +122,9 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + echo "semaphore: True" >> $CABAL_CONFIG cat >> $CABAL_CONFIG <