Auto merge of rust-lang#138817 - cuviper:beta-next, r=cuviper

[beta] backports

- CI: Stop /msys64/bin from being prepended to PATH in msys2 shell rust-lang#136815
- Install licenses into `share/doc/rust/licenses` rust-lang#138412

r? cuviper

Author: bors

Diff for: .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 for: 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 for: 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}"