Fix windows CI

Author: wz1000

.gitlab-ci.yml

@@ -17,10 +17,10 @@ variables:
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.0.2
       CABAL_PROJECT: cabal-ghc90.project
-    - GHC_VERSION: 9.2.1
-      CABAL_PROJECT: cabal-ghc92.project
     - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal-ghc92.project
+    - GHC_VERSION: 9.2.1
+      CABAL_PROJECT: cabal-ghc92.project
 
 workflow:
   rules:

.gitlab/tar.sh

@@ -10,7 +10,7 @@ ls -la out/
 TARBALL_PREFIX="haskell-language-server"
 case "${TARBALL_EXT}" in
     zip)
-		HLS_VERSION="$("$CI_PROJECT_DIR/out/haskell-language-server-wrapper" --numeric-version)"
+		HLS_VERSION="$("$CI_PROJECT_DIR/out/haskell-language-server-8.10.7" --numeric-version)"
 		cd out/
         zip "${TARBALL_PREFIX}-${HLS_VERSION}-${TARBALL_ARCHIVE_SUFFIX}.zip" haskell-language-server-*
 		find . -type f ! -name '*.zip' -delete

GNUmakefile

@@ -66,7 +66,7 @@ define set_rpath
 endef
 
 hls: bindist/ghcs
-	for ghc in $(shell [ -e "bindist/ghcs-`uname`" ] && cat "bindist/ghcs-`uname`" || cat "bindist/ghcs") ; do \
+	for ghc in $(shell [ -e "bindist/ghcs-`uname -o`" ] && cat "bindist/ghcs-`uname -o`" || cat "bindist/ghcs") ; do \
 		$(GHCUP) -v install ghc `echo $$ghc | $(AWK) -F ',' '{ print $$1 }'` && \
 		$(GHCUP) -v gc -p -s -c && \
 		$(MAKE) GHC_VERSION=`echo $$ghc | $(AWK) -F ',' '{ print $$1 }'` PROJECT_FILE=`echo $$ghc | $(AWK) -F ',' '{ print $$2 }'` hls-ghc && \

bindist/ghcs-Msys

@@ -0,0 +1,4 @@
+8.10.7,cabal.project
+9.0.2,cabal-ghc90.project
+9.2.2,cabal-ghc92.project
+9.2.1,cabal-ghc92.project