diff options
| author | Boxy <rust@boxyuwu.dev> | 2025-01-29 16:46:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-29 16:46:09 +0000 |
| commit | 0b4890851287f7552e25beb43ab67243a87a1ff4 (patch) | |
| tree | 6b28cb50611b2bbcca661aaef967dd4a6eb7f26f /src/ci/github-actions | |
| parent | bec4359db9bf5fd3c6e9d4a88d26dcf091b3c82a (diff) | |
| parent | 815c5d4eee36e836c7b75aa9288a58c4e8e7830b (diff) | |
| download | rust-0b4890851287f7552e25beb43ab67243a87a1ff4.tar.gz rust-0b4890851287f7552e25beb43ab67243a87a1ff4.zip | |
Rustc pull
Diffstat (limited to 'src/ci/github-actions')
| -rwxr-xr-x | src/ci/github-actions/ci.py | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 26 |
2 files changed, 21 insertions, 7 deletions
diff --git a/src/ci/github-actions/ci.py b/src/ci/github-actions/ci.py index b7dac412dbe..c93766ef33a 100755 --- a/src/ci/github-actions/ci.py +++ b/src/ci/github-actions/ci.py @@ -249,7 +249,7 @@ def run_workflow_locally(job_data: Dict[str, Any], job_name: str, pr_jobs: bool) env = os.environ.copy() env.update(custom_env) - subprocess.run(args, env=env) + subprocess.run(args, env=env, check=True) def calculate_job_matrix(job_data: Dict[str, Any]): diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 799ea3e9ad2..7730d29d28f 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -35,6 +35,10 @@ runners: os: windows-2022 <<: *base-job + - &job-windows-25 + os: windows-2025 + <<: *base-job + - &job-windows-8c os: windows-2022-8core-32gb <<: *base-job @@ -44,8 +48,12 @@ runners: <<: *base-job - &job-aarch64-linux + # Free some disk space to avoid running out of space during the build. + free_disk: true os: ubuntu-22.04-arm + - &job-aarch64-linux-8c + os: ubuntu-22.04-arm64-8core-32gb envs: env-x86_64-apple-tests: &env-x86_64-apple-tests SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact @@ -138,7 +146,7 @@ auto: - name: dist-aarch64-linux env: CODEGEN_BACKENDS: llvm,cranelift - <<: *job-aarch64-linux + <<: *job-aarch64-linux-8c - name: dist-android <<: *job-linux-4c @@ -442,23 +450,29 @@ auto: # Windows Builders # ###################### - - name: x86_64-msvc + - name: x86_64-msvc-1 env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-msvc - <<: *job-windows-8c + SCRIPT: make ci-msvc-py + <<: *job-windows-25 + + - name: x86_64-msvc-2 + env: + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-msvc-ps1 + <<: *job-windows-25 # i686-msvc is split into two jobs to run tests in parallel. - name: i686-msvc-1 env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-msvc-py-set1 + SCRIPT: make ci-msvc-py <<: *job-windows - name: i686-msvc-2 env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-msvc-ps1-set2 + SCRIPT: make ci-msvc-ps1 <<: *job-windows # x86_64-msvc-ext is split into multiple jobs to run tests in parallel. |