diff options
| -rwxr-xr-x | src/ci/github-actions/calculate-job-matrix.py | 4 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ci/github-actions/calculate-job-matrix.py b/src/ci/github-actions/calculate-job-matrix.py index a844b201c16..c24cefa8d89 100755 --- a/src/ci/github-actions/calculate-job-matrix.py +++ b/src/ci/github-actions/calculate-job-matrix.py @@ -81,9 +81,9 @@ def calculate_jobs(job_type: JobType, job_data: Dict[str, Any]) -> List[Dict[str if job_type == JobType.PR: return add_base_env(name_jobs(job_data["pr"], "PR"), job_data["envs"]["pr"]) elif job_type == JobType.Try: - return add_base_env(name_jobs(job_data["try"], "try"), job_data["envs"]["production"]) + return add_base_env(name_jobs(job_data["try"], "try"), job_data["envs"]["try"]) elif job_type == JobType.Auto: - return add_base_env(name_jobs(job_data["auto"], "auto"), job_data["envs"]["production"]) + return add_base_env(name_jobs(job_data["auto"], "auto"), job_data["envs"]["auto"]) return [] diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index a287a4383e3..ec58bd0924e 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -39,6 +39,7 @@ runners: envs: production: + &production DEPLOY_BUCKET: rust-lang-ci2 TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues TOOLSTATE_PUBLISH: 1 @@ -51,6 +52,13 @@ envs: ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 AWS_REGION: us-west-1 + try: + <<: *production + DIST_TRY_BUILD: 1 + + auto: + <<: *production + pr: PR_CI_JOB: 1 @@ -76,7 +84,6 @@ pr: try: - image: dist-x86_64-linux env: - DIST_TRY_BUILD: 1 CODEGEN_BACKENDS: llvm,cranelift <<: *job-linux-16c |