diff options
| author | bors <bors@rust-lang.org> | 2025-03-22 17:14:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-22 17:14:23 +0000 |
| commit | 7824ede68eef464473b01249568df27ed9e4fc27 (patch) | |
| tree | ffc4112a88bab56e546faaa8a27188d2e1c87500 | |
| parent | 8c7969a3ae4a292789a415618fd3ebd35bee38e9 (diff) | |
| parent | 7fc74cdd8bb2737003f18e0a4711703f0d984bbd (diff) | |
| download | rust-7824ede68eef464473b01249568df27ed9e4fc27.tar.gz rust-7824ede68eef464473b01249568df27ed9e4fc27.zip | |
Auto merge of #138817 - cuviper:beta-next, r=cuviper
[beta] backports - CI: Stop /msys64/bin from being prepended to PATH in msys2 shell #136815 - Install licenses into `share/doc/rust/licenses` #138412 r? cuviper
| -rw-r--r-- | .github/workflows/ci.yml | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 2 | ||||
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c119847421..59d5f779d68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -187,6 +187,11 @@ jobs: Remove-Item -Force -Recurse $kits\$kind\$sdk_version -ErrorAction Continue } + # Show the environment just before we run the build + # This makes it easier to diagnose problems with the above install scripts. + - name: show the current environment + run: src/ci/scripts/dump-environment.sh + - name: run the build # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs. run: src/ci/scripts/run-build-from-ci.sh 2>&1 diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index c33f11f684f..f9ff133b651 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -515,7 +515,7 @@ impl Step for Rustc { // The REUSE-managed license files let license = |path: &Path| { - builder.install(path, &image.join("share/doc/rust/licences"), 0o644); + builder.install(path, &image.join("share/doc/rust/licenses"), 0o644); }; for entry in t!(std::fs::read_dir(builder.src.join("LICENSES"))).flatten() { license(&entry.path()); diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 91eab2e7a08..c8c501e646a 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -32,6 +32,12 @@ if isWindows && isKnownToBeMingwBuild; then ;; esac + # Stop /msys64/bin from being prepended to PATH by adding the bin directory manually. + # Note that this intentionally uses a Windows style path instead of the msys2 path to + # avoid being auto-translated into `/usr/bin`, which will not have the desired effect. + msys2Path="c:/msys64" + ciCommandAddPath "${msys2Path}/usr/bin" + mingw_dir="mingw${bits}" curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" |