Merge branch 'main' into freeze-version

.devcontainer/VERSION_MATRIX.md

@@ -2,11 +2,11 @@
 
 ## Current
 
-| GHC                           | Cabal[^1] | Stack[^1] | HLS                                      |
-|:------------------------------|:----------|:----------|:---------------------------------------- |
-| latest<br>9.10.1<br>9.10<br>9 | 3.12.1.0  | ≥ 2.13.1  | latest<br>2.9.0.0                        |
-| 9.8.2<br>9.8                  | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.0<br>2.8.0.0<br>2.7.0.0<br>2.6.0.0 |
-| 9.6.6<br>9.6                  | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.1                                  |
+| GHC                           | Cabal[^1] | Stack[^1] | HLS                                                 |
+|:------------------------------|:----------|:----------|:--------------------------------------------------- |
+| latest<br>9.10.1<br>9.10<br>9 | 3.12.1.0  | ≥ 2.13.1  | latest<br>2.9.0.1<br>2.9.0.0                        |
+| 9.8.2<br>9.8                  | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.1<br>2.9.0.0<br>2.8.0.0<br>2.7.0.0<br>2.6.0.0 |
+| 9.6.6<br>9.6                  | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.1<br>2.7.0.0                                  |
 
 [^1]: built-in version; see [GHC musl > Version Matrix](../VERSION_MATRIX.md)
 
@@ -15,7 +15,7 @@
 | GHC          | Cabal[^1] | Stack[^1] | HLS                                                                                             |
 |:-------------|:----------|:----------|:----------------------------------------------------------------------------------------------- |
 | 9.8.1        | 3.10.2.1  | ≥ 2.13.1  | 2.6.0.0<br>2.5.0.0<br>2.4.0.0                                                                   |
-| 9.6.5        | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.0<br>2.8.0.0<br>2.7.0.0            |
+| 9.6.5        | 3.10.3.0  | ≥ 2.13.1  | 2.9.0.0<br>2.8.0.0<br>2.7.0.0                                                                   |
 | 9.6.4        | 3.10.3.0  | ≥ 2.13.1  | 2.7.0.0<br>2.6.0.0                                                                              |
 | 9.6.3        | 3.10.1.0  | ≥ 2.13.1  | 2.5.0.0<br>2.4.0.0<br>2.3.0.0<br>2.2.0.0                                                        |
 | 9.4.8<br>9.4 | 3.8.1.0   | ≥ 2.13.1  | 2.8.0.0<br>2.7.0.0<br>2.6.0.0<br>2.5.0.0<br>2.4.0.0                                             |

.devcontainer/ghc-9.10/devcontainer.json

@@ -5,7 +5,7 @@
     "context": "..",
     "args": {
       "GHC_VERSION": "9.10",
-      "HLS_VERSION": "2.9.0.0",
+      "HLS_VERSION": "2.9.0.1",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
       "SET_LANG": "C.UTF-8",
       "SET_TZ": ""

.devcontainer/ghc-9.8/devcontainer.json

@@ -5,7 +5,7 @@
     "context": "..",
     "args": {
       "GHC_VERSION": "9.8",
-      "HLS_VERSION": "2.9.0.0",
+      "HLS_VERSION": "2.9.0.1",
       "USE_ZSH_FOR_ROOT": "unset-to-use-ash",
       "SET_LANG": "C.UTF-8",
       "SET_TZ": ""

.gitlab-ci.yml

 .env:
   variables:
-    GHC_VERSION: "9.6.6"
-    CABAL_VERSION: "3.10.3.0"
+    GHC_VERSION: "9.10.1"
+    CABAL_VERSION: "3.12.1.0"
     STACK_VERSION: "2.15.7"
     HLS_VERSION: "2.9.0.1"
     BUILD_GHC: "true"
     BUILD_HLS: "true"
-    TAG_VERSION_MAJ_MIN: "true"
+    TAG_VERSION_MAJ_MIN: "false"
     TAG_VERSION_MAJ: "false"
 
 .before-script-build: &before-script-build