From 4415a859704733d406a8cfead3b233a208732cc6 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Thu, 30 Jun 2022 00:07:44 +0200
Subject: [PATCH] CI fixes

---
 .gitlab-ci.yml | 9 ++++++++-
 .gitlab/ci.sh  | 8 ++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d23755e..304028f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,6 +136,7 @@ build-armv7-linux-deb10:
     - sudo apt install -y patchelf tree
   variables:
     ADD_CABAL_ARGS: ""
+  allow_failure: true
 
 tar-armv7-linux-deb10:
   extends:
@@ -148,6 +149,7 @@ tar-armv7-linux-deb10:
   variables:
     TARBALL_ARCHIVE_SUFFIX: armv7-deb10-linux
     TARBALL_EXT: tar.xz
+  allow_failure: true
 
 test-armv7-linux-deb10:
   extends:
@@ -157,6 +159,7 @@ test-armv7-linux-deb10:
   before_script:
     - sudo apt update
     - sudo apt install -y tree
+  allow_failure: true
 
 
 ######################
@@ -308,7 +311,7 @@ build-x86_64-linux-alpine:
   before_script:
     - sudo apk add --no-cache tar zlib zlib-dev zlib-static bzip2 bzip2-dev bzip2-static gmp gmp-dev xz xz-dev ncurses-static patchelf findutils tree
   variables:
-    ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
+    ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static -f-dynamic"
 
 tar-x86_64-linux-alpine:
   extends:
@@ -359,6 +362,7 @@ tar-x86_64-freebsd12:
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-unknown-freebsd12
     TARBALL_EXT: tar.xz
+  allow_failure: true
 
 test-x86_64-freebsd12:
   extends: .test
@@ -368,6 +372,7 @@ test-x86_64-freebsd12:
   before_script:
     - sudo pkg update
     - sudo pkg install --yes patchelf gmake tree binutils
+  allow_failure: true
 
 
 ######################
@@ -397,6 +402,7 @@ tar-x86_64-freebsd13:
   variables:
     TARBALL_ARCHIVE_SUFFIX: x86_64-unknown-freebsd13
     TARBALL_EXT: tar.xz
+  allow_failure: true
 
 test-x86_64-freebsd13:
   extends: .test
@@ -407,6 +413,7 @@ test-x86_64-freebsd13:
     - sudo pkg update
     - sudo pkg install --yes compat12x-amd64 gmake tree binutils
     - sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
+  allow_failure: true
 
 
 ######################
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 180c813e..6fa192f6 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -49,12 +49,8 @@ esac
 
 case "$(uname)" in
     MSYS_*|MINGW*)
-    # workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
-    export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
-    ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
-    cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
-    cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
-    ghc --info
+		ghc --info
+
 		# Shorten binary names
 		sed -i.bak -e 's/haskell-language-server/hls/g' \
 			   -e 's/haskell_language_server/hls/g' \
-- 
GitLab