diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-07-18 08:27:59 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-06 06:13:53 -0400 |
| commit | f8bec4e37827bc8ff77a00773692fea4e7193af4 (patch) | |
| tree | bdd3fede6d5336188d424e1e780520107c45f868 | |
| parent | fab0ee93abda33bf5c7eb5ca0372e12bd140a252 (diff) | |
| download | haskell-f8bec4e37827bc8ff77a00773692fea4e7193af4.tar.gz | |
gitlab-ci: Fix hadrian bootstrapping of release pipelines
Previously we would attempt to test hadrian bootstrapping in the
`validate` build flavour. However, `ci.sh` refuses to run validation
builds during release pipelines, resulting in job failures. Fix this by
testing bootstrapping in the `release` flavour during release pipelines.
We also attempted to record perf notes for these builds, which is
redundant work and undesirable now since we no longer build in a
consistent flavour.
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d56997fe3..6f2083e608 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -627,14 +627,18 @@ test-bootstrap: - popd - rm -Rf test-bootstrap variables: - TEST_ENV: "x86_64-linux-deb10-hadrian" + # Don't record performance benchmarks + TEST_ENV: "" BIN_DIST_NAME: "ghc-x86_64-deb10-linux" BUILD_FLAVOUR: "validate" NO_BOOT: "1" rules: - if: $NIGHTLY - - if: '$RELEASE_JOB == "yes"' - if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/' + - if: '$RELEASE_JOB == "yes"' + when: always + variables: + BUILD_FLAVOUR: "release" ############################################################ diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 42c487bf0c..b23def26ea 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -457,7 +457,11 @@ function fetch_perf_notes() { } function push_perf_notes() { - if [ -n "${CROSS_TARGET:-}" ]; then + if [[ -z "${TEST_ENV:-}" ]]; then + return + fi + + if [[ -n "${CROSS_TARGET:-}" ]]; then info "Can't test cross-compiled build." return fi |