From a8b1c33280e3f6a9925a3bb453ab041bce6561ab Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 20 Sep 2021 11:25:40 +0200 Subject: [PATCH] Add FreeBSD12 CI back --- .gitlab-ci.yml | 57 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c63f2cd..2726d94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ variables: ARCH: "ARM64" CABAL_DIR: "$CI_PROJECT_DIR/cabal" -.freebsd: +.freebsd13: tags: - x86_64-freebsd13 variables: @@ -83,6 +83,14 @@ variables: ARCH: "64" CABAL_DIR: "$CI_PROJECT_DIR/cabal" +.freebsd12: + tags: + - x86_64-freebsd + variables: + OS: "FREEBSD" + ARCH: "64" + CABAL_DIR: "$CI_PROJECT_DIR/cabal" + .windows: tags: - new-x86_64-windows @@ -173,10 +181,18 @@ variables: runInNixShell ./.gitlab/before_script/darwin/install_deps.sh 2>&1 runInNixShell ./.gitlab/script/ghcup_version.sh 2>&1 -.test_ghcup_version:freebsd: +.test_ghcup_version:freebsd12: extends: - .test_ghcup_version - - .freebsd + - .freebsd12 + - .root_cleanup + before_script: + - ./.gitlab/before_script/freebsd/install_deps.sh + +.test_ghcup_version:freebsd13: + extends: + - .test_ghcup_version + - .freebsd13 - .root_cleanup before_script: - ./.gitlab/before_script/freebsd/install_deps.sh @@ -372,9 +388,19 @@ test:mac:aarch64: ######## freebsd test ######## -test:freebsd: +test:freebsd12: stage: test - extends: .test_ghcup_version:freebsd + extends: .test_ghcup_version:freebsd12 + variables: + GHC_VERSION: "8.10.4" + CABAL_VERSION: "3.4.0.0" + allow_failure: true # freebsd runners are unreliable + when: manual + needs: [] + +test:freebsd13: + stage: test + extends: .test_ghcup_version:freebsd13 variables: GHC_VERSION: "8.10.4" CABAL_VERSION: "3.4.0.0" @@ -508,11 +534,26 @@ release:darwin:aarch64: ######## freebsd release ######## -release:freebsd: +release:freebsd12: stage: release - needs: ["test:freebsd"] + needs: ["test:freebsd12"] extends: - - .freebsd + - .freebsd12 + - .release_ghcup + - .root_cleanup + before_script: + - ./.gitlab/before_script/freebsd/install_deps.sh + variables: + ARTIFACT: "x86_64-portbld-freebsd-ghcup" + GHC_VERSION: "8.10.6" + CABAL_VERSION: "3.4.0.0" + allow_failure: true + +release:freebsd13: + stage: release + needs: ["test:freebsd13"] + extends: + - .freebsd13 - .release_ghcup - .root_cleanup before_script: