From d7063fd6089f887a4dd78bdac0a8068dae86a68e Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:08:45 +0100 Subject: [PATCH 01/10] CI: use free runners for 5 linux jobs --- src/ci/github-actions/jobs.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 9a51a3f4268c5..b089f50b73ef0 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -143,7 +143,7 @@ auto: <<: *job-linux-4c - image: dist-arm-linux - <<: *job-linux-8c + <<: *job-linux-4c - image: dist-armhf-linux <<: *job-linux-4c @@ -213,10 +213,10 @@ auto: <<: *job-linux-4c - image: i686-gnu - <<: *job-linux-8c + <<: *job-linux-4c - image: i686-gnu-nopt - <<: *job-linux-8c + <<: *job-linux-4c - image: mingw-check <<: *job-linux-4c @@ -229,7 +229,7 @@ auto: # nightly features to compile, and this job would fail if # executed on beta and stable. only_on_channel: nightly - <<: *job-linux-8c + <<: *job-linux-4c # Tests integration with Rust for Linux. # Builds stage 1 compiler and tries to compile a few RfL examples with it. @@ -263,7 +263,7 @@ auto: <<: *job-linux-4c-largedisk - image: x86_64-gnu-distcheck - <<: *job-linux-8c + <<: *job-linux-4c - image: x86_64-gnu-llvm-19 env: From c50f770f5396347b34bc7b48d03131d4fc63e0bb Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:58:43 +0100 Subject: [PATCH 02/10] use large disk --- src/ci/github-actions/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index b089f50b73ef0..db038b625a7b6 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -229,7 +229,7 @@ auto: # nightly features to compile, and this job would fail if # executed on beta and stable. only_on_channel: nightly - <<: *job-linux-4c + <<: *job-linux-4c-largedisk # Tests integration with Rust for Linux. # Builds stage 1 compiler and tries to compile a few RfL examples with it. From 3ada89aa37574f2803668d17e684cae8a2af52ab Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 07:47:44 +0100 Subject: [PATCH 03/10] large disk --- src/ci/github-actions/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index db038b625a7b6..5498f94ea8d46 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -143,7 +143,7 @@ auto: <<: *job-linux-4c - image: dist-arm-linux - <<: *job-linux-4c + <<: *job-linux-4c-largedisk - image: dist-armhf-linux <<: *job-linux-4c From 535184d9292614c26aa2722cec2d3e1faf02331c Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:58:06 +0100 Subject: [PATCH 04/10] large disk --- src/ci/github-actions/jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 5498f94ea8d46..8cc84914f035e 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -263,7 +263,7 @@ auto: <<: *job-linux-4c-largedisk - image: x86_64-gnu-distcheck - <<: *job-linux-4c + <<: *job-linux-4c-largedisk - image: x86_64-gnu-llvm-19 env: From 3cab3bf1e9417b22d7bee6eff48220c9d49a4078 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:13:20 +0100 Subject: [PATCH 05/10] revert slow jobs --- src/ci/github-actions/jobs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 8cc84914f035e..188ed98895e94 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -143,7 +143,7 @@ auto: <<: *job-linux-4c - image: dist-arm-linux - <<: *job-linux-4c-largedisk + <<: *job-linux-8c - image: dist-armhf-linux <<: *job-linux-4c @@ -229,7 +229,7 @@ auto: # nightly features to compile, and this job would fail if # executed on beta and stable. only_on_channel: nightly - <<: *job-linux-4c-largedisk + <<: *job-linux-8c # Tests integration with Rust for Linux. # Builds stage 1 compiler and tries to compile a few RfL examples with it. @@ -263,7 +263,7 @@ auto: <<: *job-linux-4c-largedisk - image: x86_64-gnu-distcheck - <<: *job-linux-4c-largedisk + <<: *job-linux-8c - image: x86_64-gnu-llvm-19 env: From 3973872dc3698a5b92a2091978ded644002728dc Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:31:37 +0100 Subject: [PATCH 06/10] split jobs --- src/ci/github-actions/jobs.yml | 52 ++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 188ed98895e94..c6a3c29158268 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -212,10 +212,58 @@ auto: - image: dist-x86_64-netbsd <<: *job-linux-4c - - image: i686-gnu + - image: i686-gnu-1 + env: + SCRIPT: > + python3 ../x.py --stage 2 test + tests/ui + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps + tests/rustdoc + <<: *job-linux-4c + + - image: i686-gnu-2 + env: + SCRIPT: > + python3 ../x.py --stage 2 test + --skip tests/ui + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps + --skip tests/rustdoc + --skip src/bootstrap + --skip tests/rustdoc-js + --skip src/tools/error_index_generator + --skip src/tools/linkchecker + <<: *job-linux-4c + + - image: i686-gnu-nopt-1 + env: + SCRIPT: > + python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && + python3 ../x.py --stage 2 test + tests/ui + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps + tests/rustdoc <<: *job-linux-4c - - image: i686-gnu-nopt + - image: i686-gnu-nopt-2 + env: + SCRIPT: > + python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && + python3 ../x.py --stage 2 test + --skip tests/ui + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps + --skip tests/rustdoc <<: *job-linux-4c - image: mingw-check From 4adcdfcdbb814988817dbb2d55c2079fe4b1870f Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:32:43 +0100 Subject: [PATCH 07/10] remove tabs --- src/ci/github-actions/jobs.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index c6a3c29158268..58b6d8140f329 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -217,10 +217,10 @@ auto: SCRIPT: > python3 ../x.py --stage 2 test tests/ui - tests/rustdoc - tests/run-make - tests/rustdoc-ui - tests/ui-fulldeps + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps tests/rustdoc <<: *job-linux-4c @@ -229,10 +229,10 @@ auto: SCRIPT: > python3 ../x.py --stage 2 test --skip tests/ui - --skip tests/rustdoc - --skip tests/run-make - --skip tests/rustdoc-ui - --skip tests/ui-fulldeps + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps --skip tests/rustdoc --skip src/bootstrap --skip tests/rustdoc-js @@ -246,10 +246,10 @@ auto: python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test tests/ui - tests/rustdoc - tests/run-make - tests/rustdoc-ui - tests/ui-fulldeps + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps tests/rustdoc <<: *job-linux-4c @@ -259,10 +259,10 @@ auto: python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test --skip tests/ui - --skip tests/rustdoc - --skip tests/run-make - --skip tests/rustdoc-ui - --skip tests/ui-fulldeps + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps --skip tests/rustdoc <<: *job-linux-4c From 08e429eeb64d85fa48f35e7d6cc40a7afcd3587d Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:33:09 +0100 Subject: [PATCH 08/10] align --- src/ci/github-actions/jobs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 58b6d8140f329..8047207eceb63 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -229,8 +229,8 @@ auto: SCRIPT: > python3 ../x.py --stage 2 test --skip tests/ui - --skip tests/rustdoc - --skip tests/run-make + --skip tests/rustdoc + --skip tests/run-make --skip tests/rustdoc-ui --skip tests/ui-fulldeps --skip tests/rustdoc From fc30a49f474a9fa81a9a0401563f7d0c0b7287e1 Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:40:55 +0100 Subject: [PATCH 09/10] indent --- src/ci/github-actions/jobs.yml | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 8047207eceb63..a09cdb8714fda 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -216,28 +216,28 @@ auto: env: SCRIPT: > python3 ../x.py --stage 2 test - tests/ui - tests/rustdoc - tests/run-make - tests/rustdoc-ui - tests/ui-fulldeps - tests/rustdoc + tests/ui + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps + tests/rustdoc <<: *job-linux-4c - image: i686-gnu-2 env: SCRIPT: > python3 ../x.py --stage 2 test - --skip tests/ui - --skip tests/rustdoc - --skip tests/run-make - --skip tests/rustdoc-ui - --skip tests/ui-fulldeps - --skip tests/rustdoc - --skip src/bootstrap - --skip tests/rustdoc-js - --skip src/tools/error_index_generator - --skip src/tools/linkchecker + --skip tests/ui + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps + --skip tests/rustdoc + --skip src/bootstrap + --skip tests/rustdoc-js + --skip src/tools/error_index_generator + --skip src/tools/linkchecker <<: *job-linux-4c - image: i686-gnu-nopt-1 @@ -245,12 +245,12 @@ auto: SCRIPT: > python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test - tests/ui - tests/rustdoc - tests/run-make - tests/rustdoc-ui - tests/ui-fulldeps - tests/rustdoc + tests/ui + tests/rustdoc + tests/run-make + tests/rustdoc-ui + tests/ui-fulldeps + tests/rustdoc <<: *job-linux-4c - image: i686-gnu-nopt-2 @@ -258,12 +258,12 @@ auto: SCRIPT: > python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test - --skip tests/ui - --skip tests/rustdoc - --skip tests/run-make - --skip tests/rustdoc-ui - --skip tests/ui-fulldeps - --skip tests/rustdoc + --skip tests/ui + --skip tests/rustdoc + --skip tests/run-make + --skip tests/rustdoc-ui + --skip tests/ui-fulldeps + --skip tests/rustdoc <<: *job-linux-4c - image: mingw-check From 448219e691be6207bb15ce3a132ec25918bf90cc Mon Sep 17 00:00:00 2001 From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:06:48 +0100 Subject: [PATCH 10/10] set image --- src/ci/github-actions/jobs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index a09cdb8714fda..8befc09e797df 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -214,6 +214,7 @@ auto: - image: i686-gnu-1 env: + IMAGE: i686-gnu SCRIPT: > python3 ../x.py --stage 2 test tests/ui @@ -226,6 +227,7 @@ auto: - image: i686-gnu-2 env: + IMAGE: i686-gnu SCRIPT: > python3 ../x.py --stage 2 test --skip tests/ui @@ -242,6 +244,7 @@ auto: - image: i686-gnu-nopt-1 env: + IMAGE: i686-gnu-nopt SCRIPT: > python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test @@ -255,6 +258,7 @@ auto: - image: i686-gnu-nopt-2 env: + IMAGE: i686-gnu-nopt SCRIPT: > python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std && python3 ../x.py --stage 2 test