Skip to content

Commit 0f30e6f

Browse files
authored
Merge branch 'rust-lang:master' into master
2 parents 4d29c52 + 63f70b3 commit 0f30e6f

File tree

407 files changed

+6323
-2305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+6323
-2305
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,21 @@ concurrency:
3636
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3737
cancel-in-progress: true
3838
jobs:
39+
calculate_matrix:
40+
name: Calculate job matrix
41+
runs-on: ubuntu-latest
42+
outputs:
43+
jobs: "${{ steps.jobs.outputs.jobs }}"
44+
steps:
45+
- name: Checkout the source code
46+
uses: actions/checkout@v4
47+
- name: Calculate the CI job matrix
48+
run: python3 src/ci/scripts/calculate-job-matrix.py >> $GITHUB_OUTPUT
49+
id: jobs
3950
pr:
4051
name: "PR - ${{ matrix.name }}"
52+
needs:
53+
- calculate_matrix
4154
env:
4255
PR_CI_JOB: 1
4356
CI_JOB_NAME: "${{ matrix.name }}"
@@ -51,20 +64,7 @@ jobs:
5164
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
5265
strategy:
5366
matrix:
54-
include:
55-
- name: mingw-check
56-
os: ubuntu-20.04-4core-16gb
57-
env: {}
58-
- name: mingw-check-tidy
59-
os: ubuntu-20.04-4core-16gb
60-
env: {}
61-
- name: x86_64-gnu-llvm-17
62-
env:
63-
ENABLE_GCC_CODEGEN: "1"
64-
os: ubuntu-20.04-16core-64gb
65-
- name: x86_64-gnu-tools
66-
os: ubuntu-20.04-16core-64gb
67-
env: {}
67+
include: "${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}"
6868
defaults:
6969
run:
7070
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

0 commit comments

Comments
 (0)