Remove the add_dummy_commit.sh hack and the corresponding bootstrap test

The new git tests should be enough to check this scenario. We should ideally not be creating dummy commits on CI.

Author: Kobzol

src/bootstrap/src/core/builder/tests.rs

@@ -238,45 +238,6 @@ fn alias_and_path_for_library() {
     );
 }
 
-#[test]
-fn ci_rustc_if_unchanged_logic() {
-    let config = Config::parse_inner(
-        Flags::parse(&[
-            "build".to_owned(),
-            "--dry-run".to_owned(),
-            "--set=rust.download-rustc='if-unchanged'".to_owned(),
-        ]),
-        |&_| Ok(Default::default()),
-    );
-
-    let build = Build::new(config.clone());
-    let builder = Builder::new(&build);
-
-    if config.out.exists() {
-        fs::remove_dir_all(&config.out).unwrap();
-    }
-
-    builder.run_step_descriptions(&Builder::get_step_descriptions(config.cmd.kind()), &[]);
-
-    // Make sure "if-unchanged" logic doesn't try to use CI rustc while there are changes
-    // in compiler and/or library.
-    if config.download_rustc_commit.is_some() {
-        let mut paths = vec!["compiler"];
-
-        // Handle library tree the same way as in `Config::download_ci_rustc_commit`.
-        if build_helper::ci::CiEnv::is_ci() {
-            paths.push("library");
-        }
-
-        let has_changes = config.has_changes_from_upstream(&paths);
-
-        assert!(
-            !has_changes,
-            "CI-rustc can't be used with 'if-unchanged' while there are changes in compiler and/or library."
-        );
-    }
-}
-
 mod defaults {
     use pretty_assertions::assert_eq;
 

src/bootstrap/src/core/config/config.rs

@@ -3034,9 +3034,6 @@ impl Config {
         // these changes to speed up the build process for library developers. This provides consistent
         // functionality for library developers between `download-rustc=true` and `download-rustc="if-unchanged"`
         // options.
-        //
-        // If you update "library" logic here, update `builder::tests::ci_rustc_if_unchanged_logic` test
-        // logic accordingly.
         if !CiEnv::is_ci() {
             allowed_paths.push(":!library");
         }

src/ci/docker/host-x86_64/x86_64-gnu-llvm-18/Dockerfile

@@ -59,11 +59,10 @@ COPY scripts/shared.sh /scripts/
 
 ARG SCRIPT_ARG
 
-COPY scripts/add_dummy_commit.sh /tmp/
 COPY scripts/x86_64-gnu-llvm.sh /tmp/
 COPY scripts/x86_64-gnu-llvm2.sh /tmp/
 COPY scripts/x86_64-gnu-llvm3.sh /tmp/
 COPY scripts/stage_2_test_set1.sh /tmp/
 COPY scripts/stage_2_test_set2.sh /tmp/
 
-ENV SCRIPT "/tmp/add_dummy_commit.sh && /tmp/${SCRIPT_ARG}"
+ENV SCRIPT "/tmp/${SCRIPT_ARG}"

src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile

@@ -58,11 +58,10 @@ COPY scripts/shared.sh /scripts/
 
 ARG SCRIPT_ARG
 
-COPY scripts/add_dummy_commit.sh /tmp/
 COPY scripts/x86_64-gnu-llvm.sh /tmp/
 COPY scripts/x86_64-gnu-llvm2.sh /tmp/
 COPY scripts/x86_64-gnu-llvm3.sh /tmp/
 COPY scripts/stage_2_test_set1.sh /tmp/
 COPY scripts/stage_2_test_set2.sh /tmp/
 
-ENV SCRIPT "/tmp/add_dummy_commit.sh && /tmp/${SCRIPT_ARG}"
+ENV SCRIPT "/tmp/${SCRIPT_ARG}"

src/ci/docker/scripts/add_dummy_commit.sh

@@ -2,8 +2,6 @@
 
 set -ex
 
-/tmp/add_dummy_commit.sh
-
 ##### Test stage 1 #####
 
 ../x.py --stage 1 test --skip src/tools/tidy

src/ci/docker/scripts/x86_64-gnu-llvm3.sh

@@ -108,8 +108,6 @@ pr:
   - name: x86_64-gnu-llvm-18
     env:
       ENABLE_GCC_CODEGEN: "1"
-      # We are adding (temporarily) a dummy commit on the compiler
-      READ_ONLY_SRC: "0"
       DOCKER_SCRIPT: x86_64-gnu-llvm.sh
     <<: *job-linux-16c
   - name: x86_64-gnu-tools
@@ -331,7 +329,6 @@ auto:
   - name: x86_64-gnu-llvm-18-1
     env:
       RUST_BACKTRACE: 1
-      READ_ONLY_SRC: "0"
       IMAGE: x86_64-gnu-llvm-18
       DOCKER_SCRIPT: stage_2_test_set1.sh
     <<: *job-linux-4c
@@ -340,7 +337,6 @@ auto:
   - name: x86_64-gnu-llvm-18-2
     env:
       RUST_BACKTRACE: 1
-      READ_ONLY_SRC: "0"
       IMAGE: x86_64-gnu-llvm-18
       DOCKER_SCRIPT: x86_64-gnu-llvm2.sh
     <<: *job-linux-4c
@@ -349,7 +345,6 @@ auto:
   - name: x86_64-gnu-llvm-18-3
     env:
       RUST_BACKTRACE: 1
-      READ_ONLY_SRC: "0"
       IMAGE: x86_64-gnu-llvm-18
       DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
     <<: *job-linux-4c