CI: bump GHC 9.4.5 to 9.4.6

BNFC · Aug 21, 2023 · dd8c8d8 · dd8c8d8
1 parent efa6208
commit dd8c8d8
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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