From 9652e92c564eb36c598dacebc250d4c3ae27e492 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 21 May 2025 18:36:34 +0200
Subject: [PATCH 1/5] ci test: see how pr jobs run in codebuild

---
 src/ci/github-actions/jobs.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 005007bbccdd1..626bd15fbaf23 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -351,6 +351,12 @@ auto:
       DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
     <<: *job-linux-4c
 
+  - name: x86_64-gnu-llvm-19
+    env:
+      ENABLE_GCC_CODEGEN: "1"
+      DOCKER_SCRIPT: x86_64-gnu-llvm.sh
+    <<: &job-linux-36c-codebuild
+
   # The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
   # x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-{2,3}.
   - name: x86_64-gnu-llvm-19-1
@@ -382,7 +388,7 @@ auto:
   - name: x86_64-gnu-tools
     env:
       DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
-    <<: *job-linux-4c
+    <<: *job-linux-36c-codebuild
 
   ####################
   #  macOS Builders  #

From a6fc9689e0364dc8a0902b4173fa80daa5288431 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 21 May 2025 18:42:18 +0200
Subject: [PATCH 2/5] more error messages

---
 src/ci/citool/src/jobs.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ci/citool/src/jobs.rs b/src/ci/citool/src/jobs.rs
index 5600d7b4db59b..6dbe2bd6c1383 100644
--- a/src/ci/citool/src/jobs.rs
+++ b/src/ci/citool/src/jobs.rs
@@ -85,14 +85,14 @@ impl JobDatabase {
 }
 
 pub fn load_job_db(db: &str) -> anyhow::Result<JobDatabase> {
-    let mut db: Value = serde_yaml::from_str(db)?;
+    let mut db: Value = serde_yaml::from_str(db).context("failed to parse YAML content")?;
 
     // We need to expand merge keys (<<), because serde_yaml can't deal with them
     // `apply_merge` only applies the merge once, so do it a few times to unwrap nested merges.
-    db.apply_merge()?;
-    db.apply_merge()?;
+    db.apply_merge().context("failed to apply merge keys")?;
+    db.apply_merge().context("failed to apply merge keys")?;
 
-    let db: JobDatabase = serde_yaml::from_value(db)?;
+    let db: JobDatabase = serde_yaml::from_value(db).context("failed to parse job database")?;
     Ok(db)
 }
 

From 72813d959b5d9bf985548e4ae5e405dbf802ba26 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 21 May 2025 18:46:26 +0200
Subject: [PATCH 3/5] edit name

---
 src/ci/github-actions/jobs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 626bd15fbaf23..6bdb760c8d6fc 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -351,8 +351,9 @@ auto:
       DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
     <<: *job-linux-4c
 
-  - name: x86_64-gnu-llvm-19
+  - name: x86_64-gnu-llvm-19-full
     env:
+      IMAGE: x86_64-gnu-llvm-19
       ENABLE_GCC_CODEGEN: "1"
       DOCKER_SCRIPT: x86_64-gnu-llvm.sh
     <<: &job-linux-36c-codebuild

From 411b9e23442e21c2562bb5716d5e6e976197b748 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 21 May 2025 18:54:12 +0200
Subject: [PATCH 4/5] fix

---
 src/ci/github-actions/jobs.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 6bdb760c8d6fc..0ab220c16fa9a 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -351,12 +351,11 @@ auto:
       DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
     <<: *job-linux-4c
 
-  - name: x86_64-gnu-llvm-19-full
+  - name: x86_64-gnu-llvm-19
     env:
-      IMAGE: x86_64-gnu-llvm-19
       ENABLE_GCC_CODEGEN: "1"
       DOCKER_SCRIPT: x86_64-gnu-llvm.sh
-    <<: &job-linux-36c-codebuild
+    <<: *job-linux-36c-codebuild
 
   # The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
   # x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-{2,3}.

From 216d34f7dbf2fc423b99e8ff591e9c91938048c2 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 22 May 2025 10:16:57 +0200
Subject: [PATCH 5/5] remove env var

---
 src/ci/github-actions/jobs.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 0ab220c16fa9a..76117b9092e7d 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -386,8 +386,6 @@ auto:
     <<: *job-linux-4c
 
   - name: x86_64-gnu-tools
-    env:
-      DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
     <<: *job-linux-36c-codebuild
 
   ####################