Bump GHC/Cabal in CI

.gitlab-ci.yml

@@ -125,8 +125,8 @@ test:linux:bootstrap_script:
   script:
     - ./.gitlab/script/ghcup_bootstrap.sh
   variables:
-    GHC_VERSION: "8.8.4"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
   extends:
     - .debian
 
@@ -135,14 +135,14 @@ test:linux:bootstrap_script:
 test:linux:recommended:
   extends: .test_ghcup_version:linux
   variables:
-    GHC_VERSION: "8.8.4"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
 
 test:linux:latest:
   extends: .test_ghcup_version:linux
   variables:
-    GHC_VERSION: "8.10.2"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
   allow_failure: true
 
 ######## linux 32bit test ########
@@ -150,7 +150,7 @@ test:linux:latest:
 test:linux:recommended:32bit:
   extends: .test_ghcup_version:linux32
   variables:
-    GHC_VERSION: "8.8.4"
+    GHC_VERSION: "8.10.2"
     CABAL_VERSION: "3.2.0.0"
 
 ######## darwin test ########
@@ -158,14 +158,14 @@ test:linux:recommended:32bit:
 test:mac:recommended:
   extends: .test_ghcup_version:darwin
   variables:
-    GHC_VERSION: "8.8.4"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
 
 test:mac:latest:
   extends: .test_ghcup_version:darwin
   variables:
-    GHC_VERSION: "8.10.2"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
   allow_failure: true
 
 
@@ -174,14 +174,14 @@ test:mac:latest:
 test:freebsd:recommended:
   extends: .test_ghcup_version:freebsd
   variables:
-    GHC_VERSION: "8.8.4"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
 
 test:freebsd:latest:
   extends: .test_ghcup_version:freebsd
   variables:
-    GHC_VERSION: "8.10.2"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
   allow_failure: true
 
 
@@ -195,8 +195,8 @@ release:linux:64bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.8.4"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
 
 
 release:linux:32bit:
@@ -207,7 +207,7 @@ release:linux:32bit:
     - ./.gitlab/before_script/linux/alpine/install_deps.sh
   variables:
     ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.8.4"
+    GHC_VERSION: "8.10.2"
     CABAL_VERSION: "3.2.0.0"
 
 
@@ -222,8 +222,8 @@ release:darwin:
     - ./.gitlab/before_script/darwin/install_deps.sh
   variables:
     ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.8.3"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
     MACOSX_DEPLOYMENT_TARGET: "10.7"
 
 
@@ -238,6 +238,6 @@ release:freebsd:
     - ./.gitlab/before_script/freebsd/install_deps.sh
   variables:
     ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.8.3"
-    CABAL_VERSION: "3.2.0.0"
+    GHC_VERSION: "8.10.3"
+    CABAL_VERSION: "3.4.0.0-rc4"
 

.gitlab/script/ghcup_release.sh

@@ -22,9 +22,9 @@ if [ "${OS}" = "LINUX" ] ; then
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
 	fi
 elif [ "${OS}" = "FREEBSD" ] ; then
-	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static" -ftui
+	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib +static" -ftui
 else
-	ecabal build -w ghc-${GHC_VERSION} --constraint="zlib static" --constraint="lzma static" -ftui
+	ecabal build -w ghc-${GHC_VERSION} --constraint="zlib +static" --constraint="lzma +static" -ftui
 fi
 
 mkdir out

.travis/build.sh

@@ -2,23 +2,21 @@
 
 set -ex
 
-## install ghc via old ghcup
-
 mkdir -p ~/.ghcup/bin
-curl https://gitlab.haskell.org/haskell/ghcup/raw/master/ghcup > ~/.ghcup/bin/ghcup
+curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ~/.ghcup/bin/ghcup
 chmod +x ~/.ghcup/bin/ghcup
 
 export PATH="$HOME/.ghcup/bin:$PATH"
 
-ghcup install 8.8.3
-ghcup install-cabal 3.2.0.0
-ghcup set 8.8.3
+ghcup install 8.10.3
+ghcup install-cabal 3.4.0.0-rc4
+ghcup set 8.10.3
 
 
 ## install ghcup
 
 cabal update
-cabal build --constraint="zlib static" --constraint="lzma static" -ftui
+cabal build --constraint="zlib +static" --constraint="lzma +static" -ftui
 cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
 strip ./ghcup
 cp ghcup "./${ARTIFACT}"