Skip to content

Commit a50d55f

Browse files
bnleftbnleft
authored
Merge branch 'rust-lang:master' into master
2 parents a0bb25f + 4e1f5d9 commit a50d55f

File tree

5,101 files changed

+118916
-62642
lines changed

Some content is hidden

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

5,101 files changed

+118916
-62642
lines changed

‎.github/workflows/ci.yml

Lines changed: 20 additions & 24 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-16
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' }}"
@@ -156,7 +156,7 @@ jobs:
156156
run: src/ci/scripts/verify-stable-version-number.sh
157157
if: success() && !env.SKIP_JOB
158158
- name: run the build
159-
run: src/ci/scripts/run-build-from-ci.sh
159+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
160160
env:
161161
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
162162
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -166,7 +166,7 @@ jobs:
166166
run: src/ci/scripts/create-doc-artifacts.sh
167167
if: success() && !env.SKIP_JOB
168168
- name: upload artifacts to github
169-
uses: actions/upload-artifact@v3
169+
uses: actions/upload-artifact@v4
170170
with:
171171
name: "${{ env.DOC_ARTIFACT_NAME }}"
172172
path: obj/artifacts/doc
@@ -323,10 +323,6 @@ jobs:
323323
env:
324324
RUST_BACKTRACE: 1
325325
os: ubuntu-20.04-8core-32gb
326-
- name: x86_64-gnu-llvm-16
327-
env:
328-
RUST_BACKTRACE: 1
329-
os: ubuntu-20.04-8core-32gb
330326
- name: x86_64-gnu-nopt
331327
os: ubuntu-20.04-4core-16gb
332328
env: {}
@@ -570,7 +566,7 @@ jobs:
570566
run: src/ci/scripts/verify-stable-version-number.sh
571567
if: success() && !env.SKIP_JOB
572568
- name: run the build
573-
run: src/ci/scripts/run-build-from-ci.sh
569+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
574570
env:
575571
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
576572
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -580,7 +576,7 @@ jobs:
580576
run: src/ci/scripts/create-doc-artifacts.sh
581577
if: success() && !env.SKIP_JOB
582578
- name: upload artifacts to github
583-
uses: actions/upload-artifact@v3
579+
uses: actions/upload-artifact@v4
584580
with:
585581
name: "${{ env.DOC_ARTIFACT_NAME }}"
586582
path: obj/artifacts/doc
@@ -709,7 +705,7 @@ jobs:
709705
run: src/ci/scripts/verify-stable-version-number.sh
710706
if: success() && !env.SKIP_JOB
711707
- name: run the build
712-
run: src/ci/scripts/run-build-from-ci.sh
708+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
713709
env:
714710
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
715711
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -719,7 +715,7 @@ jobs:
719715
run: src/ci/scripts/create-doc-artifacts.sh
720716
if: success() && !env.SKIP_JOB
721717
- name: upload artifacts to github
722-
uses: actions/upload-artifact@v3
718+
uses: actions/upload-artifact@v4
723719
with:
724720
name: "${{ env.DOC_ARTIFACT_NAME }}"
725721
path: obj/artifacts/doc

‎.github/workflows/dependencies.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
# Remove first line that always just says "Updating crates.io index"
6666
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
6767
- name: upload Cargo.lock artifact for use in PR
68-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
6969
with:
7070
name: Cargo-lock
7171
path: Cargo.lock
7272
retention-days: 1
7373
- name: upload cargo-update log artifact for use in PR
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: cargo-updates
7777
path: cargo_update.log
@@ -90,11 +90,11 @@ jobs:
9090
uses: actions/checkout@v4
9191

9292
- name: download Cargo.lock from update job
93-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9494
with:
9595
name: Cargo-lock
9696
- name: download cargo-update log from update job
97-
uses: actions/download-artifact@v3
97+
uses: actions/download-artifact@v4
9898
with:
9999
name: cargo-updates
100100

‎.mailmap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ James Hinshelwood <[email protected]> <[email protected]>
259259
James Miller <[email protected]> <[email protected]>
260260
James Perry <[email protected]>
261261
James Sanderson <[email protected]>
262+
Jan-Erik Rediger <[email protected]> <[email protected]>
262263
Jaro Fietz <[email protected]>
263264
Jason Fager <[email protected]>
264265
Jason Liquorish <[email protected]> <[email protected]>
@@ -306,6 +307,8 @@ Joseph T. Lyons <[email protected]> <[email protected]>
306307
Josh Cotton <[email protected]>
307308
Josh Driver <[email protected]>
308309
Josh Holmer <[email protected]>
310+
Josh Stone <[email protected]> <[email protected]>
311+
Josh Stone <[email protected]> <[email protected]>
309312
Julian Knodt <[email protected]>
310313
jumbatm <[email protected]> <[email protected]>
311314
Junyoung Cho <[email protected]>
@@ -323,6 +326,7 @@ Katze <[email protected]>
323326
Keegan McAllister <[email protected]> <[email protected]>
324327
Kerem Kat <[email protected]>
325328
Kevin Butler <[email protected]>
329+
Kevin Reid <[email protected]> <[email protected]>
326330
Kevin Jiang <[email protected]>
327331
Kornel Lesiński <[email protected]>
328332
Krishna Sai Veera Reddy <[email protected]>
@@ -472,7 +476,8 @@ Philipp Matthias Schäfer <[email protected]>
472476
phosphorus <[email protected]>
473477
Pierre Krieger <[email protected]>
474478
pierwill <[email protected]> <[email protected]>
475-
Pietro Albini <[email protected]> <[email protected]> <[email protected]>
479+
Pietro Albini <[email protected]> <[email protected]>
480+
Pietro Albini <[email protected]> <[email protected]>
476481
Pradyumna Rahul <[email protected]>
477482
Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
478483
r00ster <[email protected]>
@@ -541,6 +546,7 @@ Takashi Idobe <[email protected]>
541546
Takayuki Maeda <[email protected]>
542547
Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
543548
Tatsuyuki Ishi <[email protected]>
549+
Tau Gärtli <[email protected]> <[email protected]>
544550
Tero Hänninen <[email protected]> Tero Hänninen <[email protected]>
545551
The8472 <[email protected]>
546552
Theo Belaire <[email protected]> Theo Belaire <[email protected]>

0 commit comments

Comments
 (0)