Skip to content

Commit 8c1ea4a

Browse files
committed
Merge branch 'master' of https://github.com/rust-lang/rust
2 parents 86d6947 + 7c52d2d commit 8c1ea4a

File tree

4,731 files changed

+90520
-54158
lines changed

Some content is hidden

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

4,731 files changed

+90520
-54158
lines changed

.github/pull_request_template.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!--
2+
If this PR is related to an unstable feature or an otherwise tracked effort,
3+
please link to the relevant tracking issue here. If you don't know of a related
4+
tracking issue or there are none, feel free to ignore this.
5+
6+
This PR will get automatically assigned to a reviewer. In case you would like
7+
a specific user to review your work, you can assign it to them by using
8+
9+
r​? <reviewer name>
10+
-->

.github/workflows/ci.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
- name: Checkout the source code
5353
uses: actions/checkout@v4
5454
- name: Calculate the CI job matrix
55+
env:
56+
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
5557
run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT
5658
id: jobs
5759
job:
@@ -75,14 +77,6 @@ jobs:
7577
matrix:
7678
# Check the `calculate_matrix` job to see how is the matrix defined.
7779
include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
78-
# GitHub Actions fails the workflow if an empty list of jobs is provided to
79-
# the workflow, so we need to skip this job if nothing was produced by
80-
# the Python script.
81-
#
82-
# Unfortunately checking whether a list is empty is not possible in a nice
83-
# way due to GitHub Actions expressions limits.
84-
# This hack is taken from https://github.com/ferrocene/ferrocene/blob/d43edc6b7697cf1719ec1c17c54904ab94825763/.github/workflows/release.yml#L75-L82
85-
if: fromJSON(needs.calculate_matrix.outputs.jobs)[0] != null
8680
steps:
8781
- if: contains(matrix.os, 'windows')
8882
uses: msys2/[email protected]
@@ -160,9 +154,12 @@ jobs:
160154

161155
- name: checkout submodules
162156
run: src/ci/scripts/checkout-submodules.sh
163-
164-
- name: install MSYS2
165-
run: src/ci/scripts/install-msys2.sh
157+
158+
- name: Setup Python
159+
uses: actions/setup-python@v5
160+
with:
161+
python-version: '3.x'
162+
if: runner.environment == 'github-hosted'
166163

167164
- name: install MinGW
168165
run: src/ci/scripts/install-mingw.sh
@@ -196,7 +193,6 @@ jobs:
196193
env:
197194
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
198195
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
199-
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
200196

201197
- name: create github artifacts
202198
run: src/ci/scripts/create-doc-artifacts.sh
@@ -247,3 +243,5 @@ jobs:
247243
if: needs.calculate_matrix.outputs.run_type == 'auto'
248244
env:
249245
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
246+
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
247+
TOOLSTATE_PUBLISH: 1

.github/workflows/dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: install the bootstrap toolchain
5757
run: |
5858
# Extract the stage0 version
59-
TOOLCHAIN=$(jq -r '.compiler | {version,date} | join("-")' -- src/stage0.json)
59+
TOOLCHAIN=$(awk -F= '{a[$1]=$2} END {print(a["compiler_version"] "-" a["compiler_date"])}' src/stage0)
6060
# Install and set as default
6161
rustup toolchain install --no-self-update --profile minimal $TOOLCHAIN
6262
rustup default $TOOLCHAIN

.gitmodules

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/18.0-2024-02-13
36+
branch = rustc/18.1-2024-05-19
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
@@ -43,3 +43,7 @@
4343
path = library/backtrace
4444
url = https://github.com/rust-lang/backtrace-rs.git
4545
shallow = true
46+
[submodule "src/tools/rustc-perf"]
47+
path = src/tools/rustc-perf
48+
url = https://github.com/rust-lang/rustc-perf.git
49+
shallow = true

0 commit comments

Comments
 (0)