From 3711240e5b2dcc01a8aed7fc16a4d3823319dfd3 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Mon, 26 Sep 2022 21:16:20 +0800
Subject: [PATCH] Fix armv7
---
.gitlab/before_script/linux/install_deps.sh | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab/before_script/linux/install_deps.sh b/.gitlab/before_script/linux/install_deps.sh
index c05149a67..5bb17a97a 100755
--- a/.gitlab/before_script/linux/install_deps.sh
+++ b/.gitlab/before_script/linux/install_deps.sh
@@ -19,22 +19,24 @@ fi
case "${ARCH}" in
"ARM")
- url=https://downloads.haskell.org/~ghcup/0.1.16.1/armv7-linux-ghcup-0.1.16.1
+ url=https://downloads.haskell.org/~ghcup/0.1.17.8/armv7-linux-ghcup-0.1.17.8
;;
"ARM64")
- url=https://downloads.haskell.org/~ghcup/0.1.16.1/aarch64-linux-ghcup-0.1.16.1
+ url=https://downloads.haskell.org/~ghcup/0.1.17.8/aarch64-linux-ghcup-0.1.17.8
;;
*)
- url=https://downloads.haskell.org/~ghcup/0.1.16.1/x86_64-linux-ghcup-0.1.16.1
+ url=https://downloads.haskell.org/~ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8
;;
esac
curl -sSfL "${url}" > ./ghcup-bin
-chmod +x ghcup-bin
-./ghcup-bin -v upgrade -f
+mkdir -p "$CI_PROJECT_DIR/.ghcup/bin"
+mv ghcup-bin "$CI_PROJECT_DIR/.ghcup/bin"/ghcup
+chmod +x "$CI_PROJECT_DIR/.ghcup/bin"/ghcup
+
ghcup install ghc ${GHC_VERSION} || { cat "${GHCUP_INSTALL_BASE_PREFIX}"/logs/* ; exit 1 ; }
ghcup set ghc ${GHC_VERSION}
ghcup install cabal ${CABAL_VERSION}
-rm ghcup-bin
+
--
GitLab