hasufell
/
ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bump-GHC-CI'

This commit is contained in:
Julian Ospald 2021-02-05 11:51:11 +01:00
parent d858187fd4 5ca40caf81
commit 118dac6907
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
3 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.gitlab-ci.yml
View File

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

4
.gitlab/script/ghcup_release.sh
View File

@ -22,9 +22,9 @@ if [ "${OS}" = "LINUX" ] ; then
ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
fi fi
elif [ "${OS}" = "FREEBSD" ] ; then 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 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 fi
mkdir out mkdir out

12
.travis/build.sh
View File

@ -2,23 +2,21 @@
set -ex set -ex
## install ghc via old ghcup
mkdir -p ~/.ghcup/bin 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 chmod +x ~/.ghcup/bin/ghcup
export PATH="$HOME/.ghcup/bin:$PATH" export PATH="$HOME/.ghcup/bin:$PATH"
ghcup install 8.8.3 ghcup install 8.10.3
ghcup install-cabal 3.2.0.0 ghcup install-cabal 3.4.0.0-rc4
ghcup set 8.8.3 ghcup set 8.10.3
## install ghcup ## install ghcup
cabal update 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')" . cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
strip ./ghcup strip ./ghcup
cp ghcup "./${ARTIFACT}" cp ghcup "./${ARTIFACT}"