Skip to content

Commit 238e86a

Browse files
morr0nemorr0ne
authored
Merge branch 'rust-lang:master' into linux-none-target
2 parents 047fc52 + a8a88fe commit 238e86a

File tree

3,716 files changed

+75738
-38081
lines changed

Some content is hidden

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

3,716 files changed

+75738
-38081
lines changed

Diff for: ‎.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -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
@@ -566,7 +566,7 @@ jobs:
566566
run: src/ci/scripts/verify-stable-version-number.sh
567567
if: success() && !env.SKIP_JOB
568568
- name: run the build
569-
run: src/ci/scripts/run-build-from-ci.sh
569+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
570570
env:
571571
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
572572
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -576,7 +576,7 @@ jobs:
576576
run: src/ci/scripts/create-doc-artifacts.sh
577577
if: success() && !env.SKIP_JOB
578578
- name: upload artifacts to github
579-
uses: actions/upload-artifact@v3
579+
uses: actions/upload-artifact@v4
580580
with:
581581
name: "${{ env.DOC_ARTIFACT_NAME }}"
582582
path: obj/artifacts/doc
@@ -705,7 +705,7 @@ jobs:
705705
run: src/ci/scripts/verify-stable-version-number.sh
706706
if: success() && !env.SKIP_JOB
707707
- name: run the build
708-
run: src/ci/scripts/run-build-from-ci.sh
708+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
709709
env:
710710
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
711711
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -715,7 +715,7 @@ jobs:
715715
run: src/ci/scripts/create-doc-artifacts.sh
716716
if: success() && !env.SKIP_JOB
717717
- name: upload artifacts to github
718-
uses: actions/upload-artifact@v3
718+
uses: actions/upload-artifact@v4
719719
with:
720720
name: "${{ env.DOC_ARTIFACT_NAME }}"
721721
path: obj/artifacts/doc

Diff for: ‎.github/workflows/dependencies.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
schedule:
77
# Run weekly
88
- cron: '0 0 * * Sun'
9-
# Re-bump deps every 4 hours
10-
- cron: '0 */4 * * *'
119
workflow_dispatch:
1210
# Needed so we can run it manually
1311
permissions:
@@ -67,13 +65,13 @@ jobs:
6765
# Remove first line that always just says "Updating crates.io index"
6866
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
6967
- name: upload Cargo.lock artifact for use in PR
70-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
7169
with:
7270
name: Cargo-lock
7371
path: Cargo.lock
7472
retention-days: 1
7573
- name: upload cargo-update log artifact for use in PR
76-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7775
with:
7876
name: cargo-updates
7977
path: cargo_update.log
@@ -92,11 +90,11 @@ jobs:
9290
uses: actions/checkout@v4
9391

9492
- name: download Cargo.lock from update job
95-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9694
with:
9795
name: Cargo-lock
9896
- name: download cargo-update log from update job
99-
uses: actions/download-artifact@v3
97+
uses: actions/download-artifact@v4
10098
with:
10199
name: cargo-updates
102100

@@ -137,8 +135,8 @@ jobs:
137135
gh pr edit cargo_update --title "${PR_TITLE}" --body-file body.md --repo $GITHUB_REPOSITORY
138136
139137
- name: open new pull request
140-
# Only run if there wasn't an existing PR and if this is the weekly run
141-
if: steps.edit.outcome != 'success' && github.event.schedule == '0 0 * * Sun'
138+
# Only run if there wasn't an existing PR
139+
if: steps.edit.outcome != 'success'
142140
env:
143141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144142
run: gh pr create --title "${PR_TITLE}" --body-file body.md --repo $GITHUB_REPOSITORY

Diff for: ‎.mailmap

+7-1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ James Hinshelwood <jameshinshelwood1@gmail.com> <james.hinshelwood@bigpayme.com>
259259
James Miller <bladeon@gmail.com> <james@aatch.net>
260260
James Perry <james.austin.perry@gmail.com>
261261
James Sanderson <zofrex@gmail.com>
262+
Jan-Erik Rediger <janerik@fnordig.de> <badboy@archlinux.us>
262263
Jaro Fietz <jaro.fietz@gmx.de>
263264
Jason Fager <jfager@gmail.com>
264265
Jason Liquorish <jason@liquori.sh> <Bassetts@users.noreply.github.com>
@@ -306,6 +307,8 @@ Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
306307
Josh Cotton <jcotton42@outlook.com>
307308
Josh Driver <keeperofdakeys@gmail.com>
308309
Josh Holmer <jholmer.in@gmail.com>
310+
Josh Stone <cuviper@gmail.com> <jistone@redhat.com>
311+
Josh Stone <cuviper@gmail.com> <jistone@fedoraproject.org>
309312
Julian Knodt <julianknodt@gmail.com>
310313
jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
311314
Junyoung Cho <june0.cho@samsung.com>
@@ -323,6 +326,7 @@ Katze <binary@benary.org>
323326
Keegan McAllister <mcallister.keegan@gmail.com> <kmcallister@mozilla.com>
324327
Kerem Kat <keremkat@gmail.com>
325328
Kevin Butler <haqkrs@gmail.com>
329+
Kevin Reid <kpreid@switchb.org> <kpreid@google.com>
326330
Kevin Jiang <kwj2104@columbia.edu>
327331
Kornel Lesiński <kornel@geekhood.net>
328332
Krishna Sai Veera Reddy <veerareddy@email.arizona.edu>
@@ -472,7 +476,8 @@ Philipp Matthias Schäfer <philipp.matthias.schaefer@posteo.de>
472476
phosphorus <steepout@qq.com>
473477
Pierre Krieger <pierre.krieger1708@gmail.com>
474478
pierwill <pierwill@users.noreply.github.com> <19642016+pierwill@users.noreply.github.com>
475-
Pietro Albini <pietro@pietroalbini.org> <pietro@pietroalbini.io> <pietro.albini@ferrous-systems.com>
479+
Pietro Albini <pietro@pietroalbini.org> <pietro@pietroalbini.io>
480+
Pietro Albini <pietro@pietroalbini.org> <pietro.albini@ferrous-systems.com>
476481
Pradyumna Rahul <prkinformed@gmail.com>
477482
Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
478483
r00ster <r00ster91@protonmail.com>
@@ -541,6 +546,7 @@ Takashi Idobe <idobetakashi@gmail.com>
541546
Takayuki Maeda <takoyaki0316@gmail.com>
542547
Tamir Duberstein <tamird@gmail.com> Tamir Duberstein <tamird@squareup.com>
543548
Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
549+
Tau Gärtli <git@tau.garden> <ruben.schmidmeister@icloud.com>
544550
Tero Hänninen <lgvz@users.noreply.github.com> Tero Hänninen <tejohann@kapsi.fi>
545551
The8472 <git@infinite-source.de>
546552
Theo Belaire <theo.belaire@gmail.com> Theo Belaire <tyr.god.of.war.42@gmail.com>

0 commit comments

Comments
 (0)