Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 7ec73d2

Browse files
committed
Auto merge of rust-lang#141354 - marcoieni:codebuild-pr-jobs, r=<try>
[experiment] ci test: see how pr jobs run in codebuild try-job: x86_64-gnu-tools
2 parents 6eef33b + 216d34f commit 7ec73d2

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/ci/citool/src/jobs.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ impl JobDatabase {
8585
}
8686

8787
pub fn load_job_db(db: &str) -> anyhow::Result<JobDatabase> {
88-
let mut db: Value = serde_yaml::from_str(db)?;
88+
let mut db: Value = serde_yaml::from_str(db).context("failed to parse YAML content")?;
8989

9090
// We need to expand merge keys (<<), because serde_yaml can't deal with them
9191
// `apply_merge` only applies the merge once, so do it a few times to unwrap nested merges.
92-
db.apply_merge()?;
93-
db.apply_merge()?;
92+
db.apply_merge().context("failed to apply merge keys")?;
93+
db.apply_merge().context("failed to apply merge keys")?;
9494

95-
let db: JobDatabase = serde_yaml::from_value(db)?;
95+
let db: JobDatabase = serde_yaml::from_value(db).context("failed to parse job database")?;
9696
Ok(db)
9797
}
9898

src/ci/github-actions/jobs.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,12 @@ auto:
351351
DOCKER_SCRIPT: x86_64-gnu-llvm3.sh
352352
<<: *job-linux-4c
353353

354+
- name: x86_64-gnu-llvm-19
355+
env:
356+
ENABLE_GCC_CODEGEN: "1"
357+
DOCKER_SCRIPT: x86_64-gnu-llvm.sh
358+
<<: *job-linux-36c-codebuild
359+
354360
# The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
355361
# x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-{2,3}.
356362
- name: x86_64-gnu-llvm-19-1
@@ -380,9 +386,7 @@ auto:
380386
<<: *job-linux-4c
381387

382388
- name: x86_64-gnu-tools
383-
env:
384-
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
385-
<<: *job-linux-4c
389+
<<: *job-linux-36c-codebuild
386390

387391
####################
388392
# macOS Builders #

0 commit comments

Comments
 (0)