Compare commits

...

4 Commits

Author SHA1 Message Date
3a154b301b
fix 2021-10-10 20:21:36 +02:00
9bf21daf9e
debug 2021-10-10 18:38:46 +02:00
ece03220c9
Fix git CI job 2021-10-10 18:26:19 +02:00
f838112e8b
Rename stages 2021-10-10 17:24:39 +02:00
2 changed files with 42 additions and 28 deletions

View File

@ -1,8 +1,8 @@
stages: stages:
- checks - linting
- quick-test - quick-tests
- test - tests
- expensive-test - expensive-tests
- release - release
variables: variables:
@ -232,7 +232,7 @@ variables:
######## stack test ######## ######## stack test ########
test:linux:stack: test:linux:stack:
stage: test stage: tests
before_script: before_script:
- ./.gitlab/before_script/linux/install_deps_minimal.sh - ./.gitlab/before_script/linux/install_deps_minimal.sh
script: script:
@ -244,7 +244,7 @@ test:linux:stack:
######## bootstrap test ######## ######## bootstrap test ########
test:linux:bootstrap_script: test:linux:bootstrap_script:
stage: quick-test stage: quick-tests
before_script: before_script:
- ./.gitlab/before_script/linux/install_deps_minimal.sh - ./.gitlab/before_script/linux/install_deps_minimal.sh
script: script:
@ -258,7 +258,7 @@ test:linux:bootstrap_script:
needs: [] needs: []
test:windows:bootstrap_powershell_script: test:windows:bootstrap_powershell_script:
stage: quick-test stage: quick-tests
script: script:
- ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir $CI_PROJECT_DIR -BootstrapUrl $CI_PROJECT_DIR/bootstrap-haskell -InBash - ./scripts/bootstrap/bootstrap-haskell.ps1 -InstallDir $CI_PROJECT_DIR -BootstrapUrl $CI_PROJECT_DIR/bootstrap-haskell -InBash
after_script: after_script:
@ -276,7 +276,7 @@ test:windows:bootstrap_powershell_script:
######## linux test ######## ######## linux test ########
test:linux: test:linux:
stage: test stage: tests
extends: .test_ghcup_version:linux extends: .test_ghcup_version:linux
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -284,7 +284,7 @@ test:linux:
needs: [] needs: []
test:linux:hls: test:linux:hls:
stage: expensive-test stage: expensive-tests
extends: extends:
- .test_ghcup_version - .test_ghcup_version
- .debian - .debian
@ -301,7 +301,7 @@ test:linux:hls:
- ./.gitlab/script/ghcup_hls.sh - ./.gitlab/script/ghcup_hls.sh
test:linux:cross-armv7: test:linux:cross-armv7:
stage: expensive-test stage: expensive-tests
extends: extends:
- .test_ghcup_version - .test_ghcup_version
- .debian - .debian
@ -319,21 +319,22 @@ test:linux:cross-armv7:
- ./.gitlab/script/ghcup_cross.sh - ./.gitlab/script/ghcup_cross.sh
test:linux:git:hadrian: test:linux:git:hadrian:
stage: expensive-test stage: expensive-tests
extends: extends:
- .test_ghcup_version - .test_ghcup_version
- .debian - .alpine:64bit
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.8.4"
GHC_GIT_TAG: "ghc-9.0.1-release" GHC_GIT_TAG: "ghc-8.10.7-release"
GHC_GIT_VERSION: "9.0.1" GHC_GIT_VERSION: "8.10.7"
CABAL_VERSION: "3.6.2.0" CABAL_VERSION: "3.6.2.0"
CROSS: "" CROSS: ""
needs: [] needs: []
when: manual when: manual
allow_failure: true allow_failure: true
before_script: before_script:
- ./.gitlab/before_script/linux/install_deps.sh - apk add --no-cache python3 autoconf automake
- ./.gitlab/before_script/linux/alpine/install_deps.sh
script: script:
- ./.gitlab/script/ghcup_git.sh - ./.gitlab/script/ghcup_git.sh
@ -341,7 +342,7 @@ test:linux:git:hadrian:
######## linux 32bit test ######## ######## linux 32bit test ########
test:linux:32bit: test:linux:32bit:
stage: test stage: tests
extends: .test_ghcup_version:linux32 extends: .test_ghcup_version:linux32
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -351,7 +352,7 @@ test:linux:32bit:
######## arm tests ######## ######## arm tests ########
test:linux:armv7: test:linux:armv7:
stage: test stage: tests
extends: .test_ghcup_version:armv7 extends: .test_ghcup_version:armv7
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -361,7 +362,7 @@ test:linux:armv7:
needs: [] needs: []
test:linux:aarch64: test:linux:aarch64:
stage: test stage: tests
extends: .test_ghcup_version:aarch64 extends: .test_ghcup_version:aarch64
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -373,7 +374,7 @@ test:linux:aarch64:
######## darwin test ######## ######## darwin test ########
test:mac: test:mac:
stage: test stage: tests
extends: .test_ghcup_version:darwin extends: .test_ghcup_version:darwin
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -381,7 +382,7 @@ test:mac:
needs: [] needs: []
test:mac:aarch64: test:mac:aarch64:
stage: test stage: tests
extends: .test_ghcup_version:darwin:aarch64 extends: .test_ghcup_version:darwin:aarch64
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -393,7 +394,7 @@ test:mac:aarch64:
######## freebsd test ######## ######## freebsd test ########
test:freebsd12: test:freebsd12:
stage: test stage: tests
extends: .test_ghcup_version:freebsd12 extends: .test_ghcup_version:freebsd12
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -403,7 +404,7 @@ test:freebsd12:
needs: [] needs: []
test:freebsd13: test:freebsd13:
stage: test stage: tests
extends: .test_ghcup_version:freebsd13 extends: .test_ghcup_version:freebsd13
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -415,7 +416,7 @@ test:freebsd13:
######## windows test ######## ######## windows test ########
test:windows: test:windows:
stage: test stage: tests
extends: .test_ghcup_version:windows extends: .test_ghcup_version:windows
variables: variables:
GHC_VERSION: "8.10.7" GHC_VERSION: "8.10.7"
@ -587,7 +588,7 @@ release:windows:
######## hlint ######## ######## hlint ########
hlint: hlint:
stage: checks stage: linting
extends: extends:
- .debian - .debian
script: script:
@ -602,7 +603,7 @@ hlint:
######## mkdocs ######## ######## mkdocs ########
mkdocs: mkdocs:
stage: checks stage: linting
extends: extends:
- .debian - .debian
before_script: before_script:
@ -619,7 +620,7 @@ shellcheck:
image: "koalaman/shellcheck-alpine" image: "koalaman/shellcheck-alpine"
tags: tags:
- x86_64-linux - x86_64-linux
stage: checks stage: linting
script: script:
- shellcheck scripts/bootstrap/bootstrap-haskell - shellcheck scripts/bootstrap/bootstrap-haskell
allow_failure: true allow_failure: true

View File

@ -41,7 +41,20 @@ cabal --version
eghcup debug-info eghcup debug-info
eghcup compile ghc -j $(nproc) -g ${GHC_GIT_TAG} -b ${GHC_VERSION} -- --enable-unregisterised (
cd /tmp
ecabal install --installdir="$CI_PROJECT_DIR/.local/bin" --overwrite-policy=always --install-method=copy --constraint="happy == 1.19.12" happy
ecabal install --installdir="$CI_PROJECT_DIR/.local/bin" --overwrite-policy=always --install-method=copy --constraint="alex == 3.2.6" alex
)
ls -la "$CI_PROJECT_DIR/.local/bin"
which alex
which happy
"$CI_PROJECT_DIR/.local/bin/alex" --version
"$CI_PROJECT_DIR/.local/bin/happy" --version
eghcup compile ghc -j $(nproc) -g ${GHC_GIT_TAG} -b ${GHC_VERSION} --hadrian -- --enable-unregisterised
eghcup set ghc ${GHC_GIT_VERSION} eghcup set ghc ${GHC_GIT_VERSION}
[ `$(eghcup whereis ghc ${GHC_GIT_VERSION}) --numeric-version` = "${GHC_GIT_VERSION}" ] [ `$(eghcup whereis ghc ${GHC_GIT_VERSION}) --numeric-version` = "${GHC_GIT_VERSION}" ]