diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-03-21 22:32:23 +0100 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-04-20 09:35:39 +0200 |
| commit | 432c4a80e9b03505f73e85828bd152a5efc2f98b (patch) | |
| tree | 260208e20b410687f339c7608351732e5c82e22a /src/ci/docker/scripts | |
| parent | 64795ecb871c4905e0a3530ac74a39565b83bc47 (diff) | |
| download | rust-432c4a80e9b03505f73e85828bd152a5efc2f98b.tar.gz rust-432c4a80e9b03505f73e85828bd152a5efc2f98b.zip | |
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.
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/add_dummy_commit.sh | 19 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/x86_64-gnu-llvm3.sh | 2 |
2 files changed, 0 insertions, 21 deletions
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 |