diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-30 14:10:57 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-06-01 07:44:52 -0400 |
| commit | a12a3cab7a58549cb1965872da8d9c10402b962d (patch) | |
| tree | 5d2b915eec5aea4bec9b20f6f0b5c41c061f5dd8 | |
| parent | 9004be3cb19d914fa723082d35689afabede796b (diff) | |
| download | haskell-a12a3cab7a58549cb1965872da8d9c10402b962d.tar.gz | |
ci: Don't try to run ./boot when testing bootstrap of source dist
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aefa6ee42f..f700eab3bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -587,6 +587,7 @@ test-bootstrap: TEST_ENV: "x86_64-linux-deb10-hadrian" BIN_DIST_NAME: "ghc-x86_64-deb10-linux" BUILD_FLAVOUR: "validate" + NO_BOOT: "1" rules: - if: $NIGHTLY - if: '$RELEASE_JOB == "yes"' diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 7a9e11cda3..5f5409dba8 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -76,6 +76,7 @@ Environment variables affecting both build systems: during installation of test toolchain. NIX_SYSTEM On Darwin, the target platform of the desired toolchain (either "x86-64-darwin" or "aarch-darwin") + NO_BOOT Whether to run ./boot or not, used when testing the source dist Environment variables determining build configuration of Make system: @@ -404,9 +405,11 @@ EOF } function configure() { - start_section "booting" - run python3 boot - end_section "booting" + if [[ -z "${NO_BOOT:-}" ]]; then + start_section "booting" + run python3 boot + end_section "booting" + fi read -r -a args <<< "${CONFIGURE_ARGS:-}" if [[ -n "${target_triple:-}" ]]; then |