From a854cdaf9ba682c556da487a9b096c80d82cdf8f Mon Sep 17 00:00:00 2001 From: slotThe Date: Sat, 19 Mar 2022 17:12:40 +0100 Subject: [PATCH] ci: Update supported GHC versions + Prefer GHC 8.10.7 to 8.10.4, as versions seem to have stabilised now. + Add support for Stackage LTS 19; this ships with GHC 9.0.2. + Since a new version of 9.2 has been released, prefer 9.2.2 over 9.2.1. Related: https://github.com/xmonad/xmonad-contrib/pull/694 --- .github/workflows/haskell-ci-hackage.patch | 8 +++--- .github/workflows/haskell-ci.yml | 30 +++++++++++++--------- .github/workflows/stack.yml | 4 +-- xmonad.cabal | 2 +- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/workflows/haskell-ci-hackage.patch b/.github/workflows/haskell-ci-hackage.patch index 21b342e..cc45e22 100644 --- a/.github/workflows/haskell-ci-hackage.patch +++ b/.github/workflows/haskell-ci-hackage.patch @@ -38,13 +38,13 @@ set in GitHub repository secrets. linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -31,6 +38,7 @@ - compilerVersion: 9.0.1 - setup-method: hvr-ppa + compilerVersion: 9.0.2 + setup-method: ghcup allow-failure: false + upload: true - - compiler: ghc-8.10.4 + - compiler: ghc-8.10.7 compilerKind: ghc - compilerVersion: 8.10.4 + compilerVersion: 8.10.7 @@ -209,8 +217,80 @@ ${CABAL} -vnormal check - name: haddock diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 19d453d..6e61b4f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.13.20211030 +# version: 0.14.3 # -# REGENDATA ("0.13.20211030",["github","cabal.project"]) +# REGENDATA ("0.14.3",["github","cabal.project"]) # name: Haskell-CI on: @@ -27,27 +27,29 @@ jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} runs-on: ubuntu-18.04 + timeout-minutes: + 60 container: image: buildpack-deps:bionic continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: include: - - compiler: ghc-9.2.1 + - compiler: ghc-9.2.2 compilerKind: ghc - compilerVersion: 9.2.1 + compilerVersion: 9.2.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.0.1 + - compiler: ghc-9.0.2 compilerKind: ghc - compilerVersion: 9.0.1 - setup-method: hvr-ppa + compilerVersion: 9.0.2 + setup-method: ghcup allow-failure: false upload: true - - compiler: ghc-8.10.4 + - compiler: ghc-8.10.7 compilerKind: ghc - compilerVersion: 8.10.4 - setup-method: hvr-ppa + compilerVersion: 8.10.7 + setup-method: ghcup allow-failure: false - compiler: ghc-8.8.4 compilerKind: ghc @@ -72,7 +74,7 @@ jobs: apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 @@ -83,7 +85,7 @@ jobs: apt-get update apt-get install -y "$HCNAME" libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 fi @@ -145,6 +147,10 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + cat >> $CABAL_CONFIG <