From dd8c8d8474e5dac5067f796ccd5f817c7e7f10e8 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 21 Aug 2023 14:34:36 +0200 Subject: [PATCH] CI: bump GHC 9.4.5 to 9.4.6 --- .github/workflows/haskell-ci.yml | 20 +++++++++++--------- source/BNFC.cabal | 4 ++-- source/stack-9.4.5.yaml | 2 +- source/stack-9.4.6.yaml | 3 +++ source/stack-9.6.2.yaml | 2 +- stack-9.4.5.yaml | 2 +- stack-9.4.6.yaml | 7 +++++++ stack-9.6.2.yaml | 2 +- testing/bnfc-system-tests.cabal | 2 +- 9 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 source/stack-9.4.6.yaml create mode 100644 stack-9.4.6.yaml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index c2a33e25..8e891d96 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.16.4 +# version: 0.17.20230817 # -# REGENDATA ("0.16.4",["github","cabal.project"]) +# REGENDATA ("0.17.20230817",["github","cabal.project"]) # name: Haskell-CI on: @@ -39,9 +39,9 @@ jobs: compilerVersion: 9.6.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.5 + - compiler: ghc-9.4.6 compilerKind: ghc - compilerVersion: 9.4.5 + compilerVersion: 9.4.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -97,7 +97,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.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) @@ -106,7 +106,7 @@ jobs: apt-get update apt-get install -y "$HCNAME" mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi @@ -122,10 +122,12 @@ jobs: echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER if [ "${{ matrix.setup-method }}" = ghcup ]; then - HC=$HOME/.ghcup/bin/$HCKIND-$HCVER + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" - echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" else HC=$HCDIR/bin/$HCKIND diff --git a/source/BNFC.cabal b/source/BNFC.cabal index 695a3ed5..4ea83262 100644 --- a/source/BNFC.cabal +++ b/source/BNFC.cabal @@ -33,7 +33,7 @@ Description: -- Support range when build with cabal tested-with: GHC == 9.6.2 - GHC == 9.4.5 + GHC == 9.4.6 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7 @@ -55,7 +55,7 @@ extra-source-files: src/Makefile -- Support range when build with stack stack-9.6.2.yaml - stack-9.4.5.yaml + stack-9.4.6.yaml stack-9.2.8.yaml stack-9.0.2.yaml stack-8.10.7.yaml diff --git a/source/stack-9.4.5.yaml b/source/stack-9.4.5.yaml index 1985c9f1..71faf625 100644 --- a/source/stack-9.4.5.yaml +++ b/source/stack-9.4.5.yaml @@ -1,3 +1,3 @@ -resolver: lts-21.0 +resolver: lts-21.7 compiler: ghc-9.4.5 compiler-check: match-exact diff --git a/source/stack-9.4.6.yaml b/source/stack-9.4.6.yaml new file mode 100644 index 00000000..c0df5577 --- /dev/null +++ b/source/stack-9.4.6.yaml @@ -0,0 +1,3 @@ +resolver: lts-21.8 +compiler: ghc-9.4.6 +compiler-check: match-exact diff --git a/source/stack-9.6.2.yaml b/source/stack-9.6.2.yaml index 3c77feb2..04fda65e 100644 --- a/source/stack-9.6.2.yaml +++ b/source/stack-9.6.2.yaml @@ -1,3 +1,3 @@ -resolver: nightly-2023-06-26 +resolver: nightly-2023-08-21 compiler: ghc-9.6.2 compiler-check: match-exact diff --git a/stack-9.4.5.yaml b/stack-9.4.5.yaml index fa797a6f..faafb784 100644 --- a/stack-9.4.5.yaml +++ b/stack-9.4.5.yaml @@ -1,4 +1,4 @@ -resolver: lts-21.0 +resolver: lts-21.7 compiler: ghc-9.4.5 compiler-check: match-exact diff --git a/stack-9.4.6.yaml b/stack-9.4.6.yaml new file mode 100644 index 00000000..63903018 --- /dev/null +++ b/stack-9.4.6.yaml @@ -0,0 +1,7 @@ +resolver: lts-21.8 +compiler: ghc-9.4.6 +compiler-check: match-exact + +packages: +- source +- testing diff --git a/stack-9.6.2.yaml b/stack-9.6.2.yaml index 30db7cd5..7878b63d 100644 --- a/stack-9.6.2.yaml +++ b/stack-9.6.2.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2023-06-26 +resolver: nightly-2023-08-21 compiler: ghc-9.6.2 compiler-check: match-exact diff --git a/testing/bnfc-system-tests.cabal b/testing/bnfc-system-tests.cabal index c4fed455..08c54768 100644 --- a/testing/bnfc-system-tests.cabal +++ b/testing/bnfc-system-tests.cabal @@ -51,7 +51,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.6.2 - GHC == 9.4.5 + GHC == 9.4.6 GHC == 9.2.8 GHC == 9.0.2 GHC == 8.10.7