From 5980dfe063cea6135400046ce252a276ba8362bc Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:15:33 +0100
Subject: ci: remove duplicate task definition

---
 src/ci/docker/scripts/stage_2_test_set1.sh |  9 +++++++++
 src/ci/docker/scripts/stage_2_test_set2.sh | 12 ++++++++++++
 src/ci/docker/scripts/x86_64-gnu-llvm.sh   |  2 --
 src/ci/docker/scripts/x86_64-gnu-llvm1.sh  | 12 ------------
 src/ci/docker/scripts/x86_64-gnu-llvm2.sh  |  6 +-----
 5 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100755 src/ci/docker/scripts/stage_2_test_set1.sh
 create mode 100755 src/ci/docker/scripts/stage_2_test_set2.sh
 delete mode 100755 src/ci/docker/scripts/x86_64-gnu-llvm1.sh

(limited to 'src/ci/docker/scripts')

diff --git a/src/ci/docker/scripts/stage_2_test_set1.sh b/src/ci/docker/scripts/stage_2_test_set1.sh
new file mode 100755
index 00000000000..3baff4b5221
--- /dev/null
+++ b/src/ci/docker/scripts/stage_2_test_set1.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -ex
+
+# Run a subset of tests. Used to run tests in parallel in multiple jobs.
+
+../x.py --stage 2 test \
+  --skip compiler \
+  --skip src
diff --git a/src/ci/docker/scripts/stage_2_test_set2.sh b/src/ci/docker/scripts/stage_2_test_set2.sh
new file mode 100755
index 00000000000..872d758dce3
--- /dev/null
+++ b/src/ci/docker/scripts/stage_2_test_set2.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+# Run a subset of tests. Used to run tests in parallel in multiple jobs.
+
+../x.py --stage 2 test \
+  --skip tests \
+  --skip coverage-map \
+  --skip coverage-run \
+  --skip library \
+  --skip tidyselftest
diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm.sh b/src/ci/docker/scripts/x86_64-gnu-llvm.sh
index e7dcc1ddff4..e0435a3ff5c 100755
--- a/src/ci/docker/scripts/x86_64-gnu-llvm.sh
+++ b/src/ci/docker/scripts/x86_64-gnu-llvm.sh
@@ -2,8 +2,6 @@
 
 set -ex
 
-/tmp/add_dummy_commit.sh
-
 # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
 ../x.py --stage 2 test --skip src/tools/tidy
 
diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm1.sh b/src/ci/docker/scripts/x86_64-gnu-llvm1.sh
deleted file mode 100755
index 56ef39aae15..00000000000
--- a/src/ci/docker/scripts/x86_64-gnu-llvm1.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-/tmp/add_dummy_commit.sh
-
-../x.py --stage 2 test \
-  --skip tests \
-  --skip coverage-map \
-  --skip coverage-run \
-  --skip library \
-  --skip tidyselftest
diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh
index c9f6b98f01f..fe5382aaa48 100755
--- a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh
+++ b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh
@@ -2,13 +2,9 @@
 
 set -ex
 
-/tmp/add_dummy_commit.sh
-
 ##### Test stage 2 #####
 
-../x.py --stage 2 test \
-  --skip compiler \
-  --skip src
+/tmp/stage_2_test_set1.sh
 
 # Run the `mir-opt` tests again but this time for a 32-bit target.
 # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
-- 
cgit 1.4.1-3-g733a5