Remove the `add_dummy_commit.sh` hack

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

5 files changed, 2 insertions, 27 deletions

diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile
index be235f648b5..c09be047c6a 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-19/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}"
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/Dockerfile
index 408b87125e0..83a3bfb37a5 100644
--- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-20/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}"
diff --git a/src/ci/docker/scripts/add_dummy_commit.sh b/src/ci/docker/scripts/add_dummy_commit.sh
deleted file mode 100755
index 029e4ae141f..00000000000
--- a/src/ci/docker/scripts/add_dummy_commit.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-if [ "$READ_ONLY_SRC" = "0" ]; then
-    # `core::builder::tests::ci_rustc_if_unchanged_logic` bootstrap test ensures that
-    # "download-rustc=if-unchanged" logic don't use CI rustc while there are changes on
-    # compiler and/or library. Here we are adding a dummy commit on compiler and running
-    # that test to make sure we never download CI rustc with a change on the compiler tree.
-    echo "" >> ../compiler/rustc/src/main.rs
-    git config --global user.email "dummy@dummy.com"
-    git config --global user.name "dummy"
-    git add ../compiler/rustc/src/main.rs
-    git commit -m "test commit for rust.download-rustc=if-unchanged logic"
-    DISABLE_CI_RUSTC_IF_INCOMPATIBLE=0 ../x.py test bootstrap \
-        -- core::builder::tests::ci_rustc_if_unchanged_logic
-    # Revert the dummy commit
-    git reset --hard HEAD~1
-fi
diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm3.sh b/src/ci/docker/scripts/x86_64-gnu-llvm3.sh
index d1bf2dab1e2..17eb2cea59a 100755
--- a/src/ci/docker/scripts/x86_64-gnu-llvm3.sh
+++ b/src/ci/docker/scripts/x86_64-gnu-llvm3.sh
@@ -2,8 +2,6 @@
 
 set -ex
 
-/tmp/add_dummy_commit.sh
-
 ##### Test stage 1 #####
 
 ../x.py --stage 1 test --skip src/tools/tidy
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index cb2bec5a9df..950a75721c4 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -108,8 +108,6 @@ pr:
   - name: x86_64-gnu-llvm-19
     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