diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-30 14:10:57 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-31 09:50:00 +0100 |
| commit | 4b09e269e04d3895ed91b2bd5261dcf1f4398e0d (patch) | |
| tree | d93e080c8012104afad9f42d35205a9f3e747435 | |
| parent | 0817851a88cd62d25f004b85814ae01b5f221626 (diff) | |
| download | haskell-wip/bootstrap-fixes-2.tar.gz | |
ci: Don't try to run ./boot when testing bootstrap of source distwip/bootstrap-fixes-2
| -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 de11ada4be..0b33c0bcca 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 c64942a321..08dda9a5ed 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 |