summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-07-18 08:27:59 -0400
committerBen Gamari <ben@smart-cactus.org>2022-08-06 13:56:43 -0400
commitf4fc2801c5b46775e1df8af522f047c537532c0d (patch)
treea4ef2ac16581dbd9ba753a3489958c5adaa1b7c6
parent555754d69f087647d01441da6344e3b92fa6871d (diff)
downloadhaskell-f4fc2801c5b46775e1df8af522f047c537532c0d.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.yml8
-rwxr-xr-x.gitlab/ci.sh6
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 983cede183..e6dac5ccb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -569,14 +569,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 41215f3c81..9820788dc0 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