diff options
| -rwxr-xr-x | .gitlab/gen_ci.hs | 2 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 62 |
2 files changed, 1 insertions, 63 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index a7c4cd3cf4..10e7797bc8 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -875,7 +875,7 @@ job_groups = , fastCI (standardBuildsWithConfig Amd64 Windows (splitSectionsBroken vanilla)) , disableValidate (standardBuildsWithConfig Amd64 Windows (splitSectionsBroken nativeInt)) , standardBuilds Amd64 Darwin - , allowFailureGroup (addValidateRule FreeBSDLabel (standardBuilds Amd64 FreeBSD13)) + , allowFailureGroup (addValidateRule FreeBSDLabel (validateBuilds Amd64 FreeBSD13 vanilla)) , standardBuilds AArch64 Darwin , standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla) , disableValidate (validateBuilds AArch64 (Linux Debian10) llvm) diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index 678d8cbb0c..7267ec66e3 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -2358,68 +2358,6 @@ "ac_cv_func_utimensat": "no" } }, - "release-x86_64-freebsd13-release": { - "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" - ], - "allow_failure": true, - "artifacts": { - "expire_in": "1 year", - "paths": [ - "ghc-x86_64-freebsd13-release.tar.xz", - "junit.xml" - ], - "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 !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", - "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-release", - "BUILD_FLAVOUR": "release", - "CABAL_INSTALL_VERSION": "3.8.1.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 ", - "GHC_VERSION": "9.4.3", - "HADRIAN_ARGS": "--docs=no-sphinx", - "IGNORE_PERF_FAILURES": "all", - "TEST_ENV": "x86_64-freebsd13-release", - "XZ_OPT": "-9" - } - }, "release-x86_64-linux-alpine3_12-int_native-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", |