Skip to content

Commit 6d9b9c1

Browse files
authored
Merge pull request #19212 from lnicola/sync-from-rust
minor: sync from downstream
2 parents 286595e + a2bd5a5 commit 6d9b9c1

File tree

1,279 files changed

+16108
-10680
lines changed

Some content is hidden

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

1,279 files changed

+16108
-10680
lines changed

.github/workflows/ci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
7171
DOCKER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272
SCCACHE_BUCKET: rust-lang-ci-sccache2
73+
SCCACHE_REGION: us-west-1
7374
CACHE_DOMAIN: ci-caches.rust-lang.org
7475
continue-on-error: ${{ matrix.continue_on_error || false }}
7576
strategy:
@@ -173,6 +174,11 @@ jobs:
173174
- name: ensure the stable version number is correct
174175
run: src/ci/scripts/verify-stable-version-number.sh
175176

177+
# Show the environment just before we run the build
178+
# This makes it easier to diagnose problems with the above install scripts.
179+
- name: show the current environment
180+
run: src/ci/scripts/dump-environment.sh
181+
176182
- name: run the build
177183
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
178184
run: src/ci/scripts/run-build-from-ci.sh 2>&1

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
[submodule "src/llvm-project"]
3030
path = src/llvm-project
3131
url = https://github.com/rust-lang/llvm-project.git
32-
branch = rustc/19.1-2024-12-03
32+
branch = rustc/20.1-2025-02-13
3333
shallow = true
3434
[submodule "src/doc/embedded-book"]
3535
path = src/doc/embedded-book

0 commit comments

Comments
 (0)