From 3181d9b755709c7c9196031acc0cf23b781b1278 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 30 May 2022 14:10:57 +0100
Subject: ci: Don't try to run ./boot when testing bootstrap of source dist

---
 .gitlab-ci.yml | 1 +
 .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 3e3549e2f1..895fdce083 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
-- 
cgit v1.2.1