diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a36529..64146d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,13 +97,13 @@ variables: test:linux:recommended: extends: .test_ghcup_version:linux variables: - GHC_VERSION: "8.6.5" + GHC_VERSION: "8.8.3" CABAL_VERSION: "3.2.0.0" test:linux:latest: extends: .test_ghcup_version:linux variables: - GHC_VERSION: "8.8.3" + GHC_VERSION: "8.10.1" CABAL_VERSION: "3.2.0.0" allow_failure: true @@ -113,13 +113,13 @@ test:linux:latest: test:mac:recommended: extends: .test_ghcup_version:darwin variables: - GHC_VERSION: "8.6.5" + GHC_VERSION: "8.8.3" CABAL_VERSION: "3.2.0.0" test:mac:latest: extends: .test_ghcup_version:darwin variables: - GHC_VERSION: "8.8.3" + GHC_VERSION: "8.10.1" CABAL_VERSION: "3.2.0.0" allow_failure: true @@ -129,13 +129,13 @@ test:mac:latest: test:freebsd:recommended: extends: .test_ghcup_version:freebsd variables: - GHC_VERSION: "8.6.5" + GHC_VERSION: "8.8.3" CABAL_VERSION: "3.2.0.0" test:freebsd:latest: extends: .test_ghcup_version:freebsd variables: - GHC_VERSION: "8.8.3" + GHC_VERSION: "8.10.1" CABAL_VERSION: "3.2.0.0" allow_failure: true @@ -193,5 +193,5 @@ release:freebsd: - ./.gitlab/before_script/freebsd/install_deps.sh variables: ARTIFACT: "x86_64-portbld-freebsd-ghcup" - GHC_VERSION: "8.6.5" + GHC_VERSION: "8.8.3" diff --git a/.gitlab/before_script/freebsd/install_deps.sh b/.gitlab/before_script/freebsd/install_deps.sh index 1d8c6b0..0553b6c 100755 --- a/.gitlab/before_script/freebsd/install_deps.sh +++ b/.gitlab/before_script/freebsd/install_deps.sh @@ -11,15 +11,8 @@ mkdir -p "${TMPDIR}" curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin chmod +x ghcup-bin -mkdir -p "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin -# ./ghcup-bin install ${GHC_VERSION} -# ./ghcup-bin install-cabal ${CABAL_VERSION} -# ./ghcup-bin set ${GHC_VERSION} - -# install cabal-3.2.0.0 -curl -sSfL -o cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz&dl=1' -tar xf cabal-install-3.2.0.0-x86_64-portbld-freebsd.tar.xz -cp cabal "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal" -chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal" +./ghcup-bin install ${GHC_VERSION} +./ghcup-bin set ${GHC_VERSION} +./ghcup-bin install-cabal ${CABAL_VERSION} exit 0