Skip to content

Commit 3b03124

Browse files
committed
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.
1 parent 353972f commit 3b03124

File tree

5 files changed

+2
-30
lines changed

5 files changed

+2
-30
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ COPY scripts/shared.sh /scripts/
5959

6060
ARG SCRIPT_ARG
6161

62-
COPY scripts/add_dummy_commit.sh /tmp/
6362
COPY scripts/x86_64-gnu-llvm.sh /tmp/
6463
COPY scripts/x86_64-gnu-llvm2.sh /tmp/
6564
COPY scripts/x86_64-gnu-llvm3.sh /tmp/
6665
COPY scripts/stage_2_test_set1.sh /tmp/
6766
COPY scripts/stage_2_test_set2.sh /tmp/
6867

69-
ENV SCRIPT "/tmp/add_dummy_commit.sh && /tmp/${SCRIPT_ARG}"
68+
ENV SCRIPT "/tmp/${SCRIPT_ARG}"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ COPY scripts/shared.sh /scripts/
5858

5959
ARG SCRIPT_ARG
6060

61-
COPY scripts/add_dummy_commit.sh /tmp/
6261
COPY scripts/x86_64-gnu-llvm.sh /tmp/
6362
COPY scripts/x86_64-gnu-llvm2.sh /tmp/
6463
COPY scripts/x86_64-gnu-llvm3.sh /tmp/
6564
COPY scripts/stage_2_test_set1.sh /tmp/
6665
COPY scripts/stage_2_test_set2.sh /tmp/
6766

68-
ENV SCRIPT "/tmp/add_dummy_commit.sh && /tmp/${SCRIPT_ARG}"
67+
ENV SCRIPT "/tmp/${SCRIPT_ARG}"

src/ci/docker/scripts/add_dummy_commit.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
set -ex
44

5-
/tmp/add_dummy_commit.sh
6-
75
##### Test stage 1 #####
86

97
../x.py --stage 1 test --skip src/tools/tidy

src/ci/github-actions/jobs.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ pr:
108108
- name: x86_64-gnu-llvm-18
109109
env:
110110
ENABLE_GCC_CODEGEN: "1"
111-
# We are adding (temporarily) a dummy commit on the compiler
112-
READ_ONLY_SRC: "0"
113111
DOCKER_SCRIPT: x86_64-gnu-llvm.sh
114112
<<: *job-linux-16c
115113
- name: x86_64-gnu-tools
@@ -334,7 +332,6 @@ auto:
334332
- name: x86_64-gnu-llvm-18-1
335333
env:
336334
RUST_BACKTRACE: 1
337-
READ_ONLY_SRC: "0"
338335
IMAGE: x86_64-gnu-llvm-18
339336
DOCKER_SCRIPT: stage_2_test_set1.sh
340337
<<: *job-linux-4c
@@ -343,7 +340,6 @@ auto:
343340
- name: x86_64-gnu-llvm-18-2
344341
env:
345342
RUST_BACKTRACE: 1
346-
READ_ONLY_SRC: "0"
347343
IMAGE: x86_64-gnu-llvm-18
348344
DOCKER_SCRIPT: x86_64-gnu-llvm2.sh
349345
<<: *job-linux-4c
@@ -352,7 +348,6 @@ auto:
352348
- name: x86_64-gnu-llvm-18-3
353349
env:
354350
RUST_BACKTRACE: 1
355-
READ_ONLY_SRC: "0"
356351
IMAGE: x86_64-gnu-llvm-18
357352
DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
358353
<<: *job-linux-4c

0 commit comments

Comments
 (0)