[ workflows ] bump GHC 9.6.3 to 9.6.4

agda · Jan 20, 2024 · 06bc0e9 · 06bc0e9
1 parent 0c9af97
commit 06bc0e9
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 27 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -111,7 +111,7 @@ jobs:
         - false
         ghc-ver:
         - 9.8.1
-        - 9.6.3
+        - 9.6.4
         - 9.4.8
         - 9.2.8
         - 9.0.2

diff --git a/.github/workflows/stack-dry-run.yml b/.github/workflows/stack-dry-run.yml
@@ -72,7 +72,7 @@ jobs:
       fail-fast: false
       matrix:
         ghc-ver:
-        - 9.6.3
+        - 9.6.4
         - 9.4.8
         - 9.2.8
         - 9.0.2

diff --git a/Agda.cabal b/Agda.cabal
@@ -36,7 +36,7 @@ description:
 
 tested-with:
     GHC == 9.8.1
-    GHC == 9.6.3
+    GHC == 9.6.4
     GHC == 9.4.8
     GHC == 9.2.8
     GHC == 9.0.2
@@ -89,7 +89,7 @@ extra-doc-files:
 
 extra-source-files:
     stack-9.8.1.yaml
-    stack-9.6.3.yaml
+    stack-9.6.4.yaml
     stack-9.4.8.yaml
     stack-9.2.8.yaml
     stack-9.0.2.yaml

diff --git a/doc/user-manual/getting-started/installation.rst b/doc/user-manual/getting-started/installation.rst
@@ -38,7 +38,7 @@ You need recent versions of the following programs to compile Agda:
 * GHC:           https://www.haskell.org/ghc/
 
   + Agda has been tested with GHC 8.6.5, 8.8.4,
-    8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.3, and 9.8.1.
+    8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, and 9.8.1.
 
 * cabal-install: https://www.haskell.org/cabal/
 * Alex:          https://www.haskell.org/alex/

diff --git a/src/github/workflows/cabal.yml b/src/github/workflows/cabal.yml
@@ -50,7 +50,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         description: [Linux]      ## This just for pretty-printing the job name.
-        ghc-ver: [9.8.1, 9.6.3, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
+        ghc-ver: [9.8.1, 9.6.4, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
         # Need to mention "cabal-ver" at least once in the matrix, otherwise matrix.cabal-ver is an actionlint error.
         cabal-ver: ['3.10']
         cabal-flags: ['--enable-tests -f enable-cluster-counting']

diff --git a/src/github/workflows/stack-dry-run.yml b/src/github/workflows/stack-dry-run.yml
@@ -47,7 +47,7 @@ jobs:
         os: [ubuntu-latest]
         stack-ver: ['latest']
         # Note: when adding a version here, check that it is not excluded in the triggers above.
-        ghc-ver: [9.6.3, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
+        ghc-ver: [9.6.4, 9.4.8, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5]
           # Andreas, 2022-03-26:
           # Note: ghc-ver needs to be spelled out with minor version, i.e., x.y.z
           # rather than x.y (which haskell-setup would resolve to a suitable .z)

diff --git a/src/release-tools/closed-issues-for-milestone/closed-issues-for-milestone.cabal b/src/release-tools/closed-issues-for-milestone/closed-issues-for-milestone.cabal
@@ -13,8 +13,8 @@ cabal-version:       >= 1.10
 
 tested-with:
   GHC == 9.8.1
-  GHC == 9.6.3
-  GHC == 9.4.7
+  GHC == 9.6.4
+  GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2
   GHC == 8.10.7

diff --git a/src/release-tools/closed-issues-for-milestone/stack-9.4.5.yaml b/src/release-tools/closed-issues-for-milestone/stack-9.4.5.yaml
diff --git a/src/release-tools/closed-issues-for-milestone/stack-9.4.8.yaml b/src/release-tools/closed-issues-for-milestone/stack-9.4.8.yaml
@@ -0,0 +1,3 @@
+resolver: lts-21.25
+compiler: ghc-9.4.8
+compiler-check: match-exact
diff --git a/src/release-tools/closed-issues-for-milestone/stack-9.6.2.yaml b/src/release-tools/closed-issues-for-milestone/stack-9.6.2.yaml
diff --git a/src/release-tools/closed-issues-for-milestone/stack-9.6.4.yaml b/src/release-tools/closed-issues-for-milestone/stack-9.6.4.yaml
@@ -0,0 +1,3 @@
+resolver: lts-22.7
+compiler: ghc-9.6.4
+compiler-check: match-exact
diff --git a/src/release-tools/closed-issues-for-milestone/stack-9.8.1.yaml b/src/release-tools/closed-issues-for-milestone/stack-9.8.1.yaml
@@ -0,0 +1,3 @@
+resolver: nightly-2024-01-20
+compiler: ghc-9.8.1
+compiler-check: match-exact
diff --git a/src/size-solver/size-solver.cabal b/src/size-solver/size-solver.cabal
@@ -14,8 +14,8 @@ description:
   See Felix Reihl, 2013, Bachelor thesis, Ludwig-Maximilians-University.
 tested-with:
   GHC == 9.8.1
-  GHC == 9.6.3
-  GHC == 9.4.7
+  GHC == 9.6.4
+  GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2
   GHC == 8.10.7

diff --git a/stack-9.4.8.yaml b/stack-9.4.8.yaml
@@ -1,4 +1,4 @@
-resolver: lts-21.22
+resolver: lts-21.25
 compiler: ghc-9.4.8
 compiler-check: match-exact
 

diff --git a/stack-9.6.3.yaml → stack-9.6.4.yaml b/stack-9.6.3.yaml → stack-9.6.4.yaml
@@ -1,5 +1,5 @@
-resolver: lts-22.0
-compiler: ghc-9.6.3
+resolver: lts-22.7
+compiler: ghc-9.6.4
 compiler-check: match-exact
 
 # Local packages specified by relative directory name.

diff --git a/stack-9.8.1.yaml b/stack-9.8.1.yaml
@@ -1,14 +1,8 @@
-resolver: nightly-2023-11-15
+resolver: nightly-2024-01-20
 compiler: ghc-9.8.1
 compiler-check: match-exact
 
 # Local packages specified by relative directory name.
 packages:
 - '.'
 - 'src/size-solver'
-
-extra-deps:
-# (ASR 2023-10-17) Required because `nightly-2023-10-17` has
-# `aeson-2.1.2.1` which does not support GHC 9.8.1.
-  - aeson-2.2.1.0
-  - th-abstraction-0.6.0.0