Disable automatic self updates in CI environments

rust-lang · Jun 25, 2024 · d4bbf6c · d4bbf6c
1 parent fb662c5
commit d4bbf6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ci/run.bash b/ci/run.bash
@@ -77,5 +77,5 @@ build_test() {
 if [ -z "$SKIP_TESTS" ]; then
   target_cargo run --features test -- --dump-testament
   build_test build
-  build_test test
+  RUSTUP_CI=1 build_test test
 fi
diff --git a/src/config.rs b/src/config.rs
@@ -418,6 +418,12 @@ impl<'a> Cfg<'a> {
     }
 
     pub(crate) fn get_self_update_mode(&self) -> Result<SelfUpdateMode> {
+        if self.process.var("CI").is_ok() && self.process.var("RUSTUP_CI").is_err() {
+            // If we're in CI (but not rustup's own CI, which wants to test this stuff!),
+            // disable automatic self updates.
+            return Ok(SelfUpdateMode::Disable);
+        }
+
         self.settings_file.with(|s| {
             Ok(match s.auto_self_update {
                 Some(mode) => mode,