Add ghc 9.2.1 to gitlab ci (#2636)

* Remove unused nix config

* Add ghc-9.2.1 to gitlab build

* Remove not needed alpine workaround

* Use -j1 to fix oom in bsd-12

* Use -j1 to try fix oom in bsd-13

* exclude 9.2.1 for freebsd

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: jneira

.gitlab-ci.yml

@@ -11,6 +11,18 @@ variables:
   CABAL_INSTALL_VERSION: 3.6.2.0
 
 .default_matrix: &default_matrix
+  matrix:
+    - GHC_VERSION: 8.8.4
+      CABAL_PROJECT: cabal.project
+    - GHC_VERSION: 8.10.7
+      CABAL_PROJECT: cabal.project
+    - GHC_VERSION: 9.0.2
+      CABAL_PROJECT: cabal-ghc90.project
+    - GHC_VERSION: 9.2.1
+      CABAL_PROJECT: cabal-ghc921.project
+
+# ghc-9.2.1 is broken for bsd
+.freebsd_matrix: &freebsd_matrix
   matrix:
     - GHC_VERSION: 8.8.4
       CABAL_PROJECT: cabal.project
@@ -148,9 +160,9 @@ build-x86_64-freebsd12:
   extends: .build
   tags:
     - x86_64-freebsd12
-  parallel: *default_matrix
+  parallel: *freebsd_matrix
   variables:
-    ADD_CABAL_ARGS: "--enable-split-sections"
+    ADD_CABAL_ARGS: "--enable-split-sections -j1"
 
 tar-x86_64-freebsd12:
   extends: .artifacts
@@ -168,13 +180,13 @@ build-x86_64-freebsd13:
   extends: .build
   tags:
     - x86_64-freebsd13
-  parallel: *default_matrix
+  parallel: *freebsd_matrix
   before_script:
     - sudo pkg update
     - sudo pkg install --yes compat12x-amd64
     - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
   variables:
-    ADD_CABAL_ARGS: "--enable-split-sections"
+    ADD_CABAL_ARGS: "--enable-split-sections -j1"
 
 tar-x86_64-freebsd13:
   extends: .artifacts

.gitlab/ci.sh

@@ -45,11 +45,6 @@ case "$(uname -s)" in
 		;;
 esac
 
-# some alpines need workaround
-if ghc --info | grep -q integer-simple ; then
-	echo -e 'package blaze-textual\n    flags: +integer-simple' >> cabal.project.local
-fi
-
 # Shorten binary names
 sed -i.bak -e 's/haskell-language-server/hls/g' \
 	   -e 's/haskell_language_server/hls/g' \
@@ -58,9 +53,9 @@ sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
 	   src/**/*.hs exe/*.hs
 
 args=(
-	-O2
+    -O2
     -w "ghc-$GHC_VERSION"
-	--project-file "$CABAL_PROJECT"
+    --project-file "$CABAL_PROJECT"
     --disable-profiling
     --disable-tests
     --enable-executable-stripping