From 2ea8621779f0ed509ab28e11e3113b9ccb330262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Mon, 25 Aug 2025 13:39:37 +0200
Subject: [PATCH] Override `GITHUB_ACTIONS=0` for tidy tests

---
 src/bootstrap/src/core/build_steps/test.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index a6035bfc9dad..64630052543f 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -3129,7 +3129,7 @@ impl Step for Distcheck {
 
         let configure_args: Vec<String> = std::env::var("DISTCHECK_CONFIGURE_ARGS")
             .map(|args| args.split(" ").map(|s| s.to_string()).collect::<Vec<String>>())
-            .unwrap_or(vec![]);
+            .unwrap_or_default();
 
         command("tar")
             .arg("-xf")
@@ -3146,6 +3146,9 @@ impl Step for Distcheck {
             .run(builder);
         command(helpers::make(&builder.config.host_target.triple))
             .arg("check")
+            // Do not run the build as if we were in CI, otherwise git would be assumed to be
+            // present, but we build from a tarball here
+            .env("GITHUB_ACTIONS", "0")
             .current_dir(&plain_src_dir)
             .run(builder);