diff --git a/.gitlab/generate-ci/gen_ci.hs b/.gitlab/generate-ci/gen_ci.hs index 3f0c94d6acbda743594e8ad64744452bdf2c2bef..49a7b92cf7feb8c1e612a0840209395fb427cf48 100644 --- a/.gitlab/generate-ci/gen_ci.hs +++ b/.gitlab/generate-ci/gen_ci.hs @@ -995,7 +995,6 @@ job_groups = , fastCI (standardBuildsWithConfig Amd64 Windows vanilla) , disableValidate (standardBuildsWithConfig Amd64 Windows nativeInt) , addValidateRule TestPrimops (standardBuilds Amd64 Darwin) - , allowFailureGroup (onlyRule FreeBSDLabel (validateBuilds Amd64 FreeBSD13 vanilla)) , fastCI (standardBuilds AArch64 Darwin) , fastCI (standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla)) , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian11) (splitSectionsBroken vanilla)) diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index fb90c58b7896fe0a4ba96ab54656bf828f8a9f7d..8f2b877ea40d7822ab561e68c165ae81a54e2844 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -695,70 +695,6 @@ "ac_cv_func_utimensat": "no" } }, - "nightly-x86_64-freebsd13-validate": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh save_test_output", - ".gitlab/ci.sh clean", - "cat ci_timings" - ], - "allow_failure": true, - "artifacts": { - "expire_in": "8 weeks", - "paths": [ - "ghc-x86_64-freebsd13-validate.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-freebsd13-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": null, - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY)", - "when": "on_success" - } - ], - "script": [ - ".gitlab/ci.sh setup", - ".gitlab/ci.sh configure", - ".gitlab/ci.sh build_hadrian", - ".gitlab/ci.sh test_hadrian" - ], - "stage": "full-build", - "tags": [ - "x86_64-freebsd13" - ], - "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate", - "BUILD_FLAVOUR": "validate", - "CABAL_INSTALL_VERSION": "3.10.2.0", - "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check", - "GHC_VERSION": "9.6.4", - "HADRIAN_ARGS": "--docs=no-sphinx", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-freebsd13-validate", - "XZ_OPT": "-9" - } - }, "nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -4466,69 +4402,6 @@ "ac_cv_func_utimensat": "no" } }, - "x86_64-freebsd13-validate": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh save_test_output", - ".gitlab/ci.sh clean", - "cat ci_timings" - ], - "allow_failure": true, - "artifacts": { - "expire_in": "2 weeks", - "paths": [ - "ghc-x86_64-freebsd13-validate.tar.xz", - "junit.xml", - "unexpected-test-output.tar.gz" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-freebsd13-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": null, - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "(($CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/)) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)", - "when": "on_success" - } - ], - "script": [ - ".gitlab/ci.sh setup", - ".gitlab/ci.sh configure", - ".gitlab/ci.sh build_hadrian", - ".gitlab/ci.sh test_hadrian" - ], - "stage": "full-build", - "tags": [ - "x86_64-freebsd13" - ], - "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-freebsd13-validate", - "BUILD_FLAVOUR": "validate", - "CABAL_INSTALL_VERSION": "3.10.2.0", - "CONFIGURE_ARGS": "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check", - "GHC_VERSION": "9.6.4", - "HADRIAN_ARGS": "--docs=no-sphinx", - "RUNTEST_ARGS": "", - "TEST_ENV": "x86_64-freebsd13-validate" - } - }, "x86_64-linux-alpine3_12-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache",