Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Stop /msys64/bin from being prepended to PATH in msys2 shell #136815

Merged
merged 2 commits into from
Feb 20, 2025
Merged

CI: Stop /msys64/bin from being prepended to PATH in msys2 shell #136815

merged 2 commits into from
Feb 20, 2025
+11 −0

Conversation

ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Feb 10, 2025 •
edited
Loading

We used to do this a long time ago but we stopped doing it when we started installing msys2 manually.

rust/src/ci/scripts/install-msys2.sh

Lines 11 to 13 in 4fd3cf9

msys2Path="c:/msys64"
mkdir -p "${msys2Path}/home/${USERNAME}"
ciCommandAddPath "${msys2Path}/usr/bin"

Fixes #136795

try-job: dist-i686-mingw

@rustbot
Copy link
Collaborator

rustbot commented Feb 10, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Feb 10, 2025
@ChrisDenton
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@bors
Auto merge of rust-lang#136815 - ChrisDenton:fix-mingw-ci, r=<try>
ef84b3a 
Prevent Git4Win from prepending its bin directory to `PATH`

We used to do this along time ago but we stopped doing it when we started installing msys2 manually. https://github.com/rust-lang/rust/blob/4fd3cf96a1db7771ef4f332b9eb1ad17fa0fd091/src/ci/scripts/install-msys2.sh#L11-L13

Fixes rust-lang#136795

try-job: dist-i686-mingw
@bors
Copy link
Contributor

bors commented Feb 10, 2025

⌛ Trying commit 48007c1 with merge ef84b3a...

@ChrisDenton ChrisDenton mentioned this pull request Feb 10, 2025
Closed
@bors
Copy link
Contributor

bors commented Feb 10, 2025

☀️ Try build successful - checks-actions
Build commit: ef84b3a (ef84b3a4dc08c4c8e4f0a15d5f8c540ae310e7d9)

@ChrisDenton ChrisDenton changed the title Prevent Git4Win from prepending its bin directory to PATH CI: Stop /msys64/bin from being prepended to PATH in msys2 shell Feb 10, 2025
@ChrisDenton
Copy link
Member Author

Tested using:

rustup-toolchain-install-master ef84b3a4dc08c4c8e4f0a15d5f8c540ae310e7d9 --host=i686-pc-windows-gnu --targets=i686-pc-windows-gnu

It works!

@ChrisDenton
Copy link
Member Author

I added an extra step that prints the environment right before we run the actual build. That would have been super useful to have when first diagnosing this issue.

@workingjubilee workingjubilee added the O-windows-gnu Toolchain: GNU, Operating system: Windows label Feb 10, 2025
@tgross35
Copy link
Contributor

This didn't make it in before the beta branch and the toolchain is still broken so

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 18, 2025
@Kobzol
Copy link
Contributor

Kobzol commented Feb 18, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Feb 18, 2025

📌 Commit ec8ec41 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 18, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 19, 2025
@matthiaskrgr
Rollup merge of rust-lang#136815 - ChrisDenton:fix-mingw-ci, r=Kobzol
a06ebac 
CI: Stop /msys64/bin from being prepended to PATH in msys2 shell

We used to do this along time ago but we stopped doing it when we started installing msys2 manually. https://github.com/rust-lang/rust/blob/4fd3cf96a1db7771ef4f332b9eb1ad17fa0fd091/src/ci/scripts/install-msys2.sh#L11-L13

Fixes rust-lang#136795

try-job: dist-i686-mingw
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 19, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2025
@bors
Auto merge of rust-lang#137283 - matthiaskrgr:rollup-nm296fd, r=matth…
29210cb 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120580 (Add `MAX_LEN_UTF8` and `MAX_LEN_UTF16` Constants)
 - rust-lang#132268 (Impl TryFrom<Vec<u8>> for String)
 - rust-lang#136093 (Match Ergonomics 2024: update old-edition behavior of feature gates)
 - rust-lang#136344 (Suggest replacing `.` with `::` in more error diagnostics.)
 - rust-lang#136690 (Use more explicit and reliable ptr select in sort impls)
 - rust-lang#136815 (CI: Stop /msys64/bin from being prepended to PATH in msys2 shell)
 - rust-lang#136923 (Lint `#[must_use]` attributes applied to methods in trait impls)
 - rust-lang#137155 (Organize `OsString`/`OsStr` shims)
 - rust-lang#137225 (vectorcall ABI: require SSE2)

Failed merges:

 - rust-lang#136780 (std: move stdio to `sys`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 19, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2025
@bors
Auto merge of rust-lang#137290 - matthiaskrgr:rollup-a7xdbi4, r=matth…
4e1356b 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120580 (Add `MAX_LEN_UTF8` and `MAX_LEN_UTF16` Constants)
 - rust-lang#132268 (Impl TryFrom<Vec<u8>> for String)
 - rust-lang#136093 (Match Ergonomics 2024: update old-edition behavior of feature gates)
 - rust-lang#136344 (Suggest replacing `.` with `::` in more error diagnostics.)
 - rust-lang#136690 (Use more explicit and reliable ptr select in sort impls)
 - rust-lang#136815 (CI: Stop /msys64/bin from being prepended to PATH in msys2 shell)
 - rust-lang#136923 (Lint `#[must_use]` attributes applied to methods in trait impls)
 - rust-lang#137155 (Organize `OsString`/`OsStr` shims)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 40379e2 into rust-lang:master Feb 20, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 20, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 20, 2025
@rust-timer
Unrolled build for rust-lang#136815
0402ff2 
Rollup merge of rust-lang#136815 - ChrisDenton:fix-mingw-ci, r=Kobzol

CI: Stop /msys64/bin from being prepended to PATH in msys2 shell

We used to do this along time ago but we stopped doing it when we started installing msys2 manually. https://github.com/rust-lang/rust/blob/4fd3cf96a1db7771ef4f332b9eb1ad17fa0fd091/src/ci/scripts/install-msys2.sh#L11-L13

Fixes rust-lang#136795

try-job: dist-i686-mingw
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#137290 - matthiaskrgr:rollup-a7xdbi4, r=matth…
6df10f0 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120580 (Add `MAX_LEN_UTF8` and `MAX_LEN_UTF16` Constants)
 - rust-lang#132268 (Impl TryFrom<Vec<u8>> for String)
 - rust-lang#136093 (Match Ergonomics 2024: update old-edition behavior of feature gates)
 - rust-lang#136344 (Suggest replacing `.` with `::` in more error diagnostics.)
 - rust-lang#136690 (Use more explicit and reliable ptr select in sort impls)
 - rust-lang#136815 (CI: Stop /msys64/bin from being prepended to PATH in msys2 shell)
 - rust-lang#136923 (Lint `#[must_use]` attributes applied to methods in trait impls)
 - rust-lang#137155 (Organize `OsString`/`OsStr` shims)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#137290 - matthiaskrgr:rollup-a7xdbi4, r=matth…
e7decbc 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120580 (Add `MAX_LEN_UTF8` and `MAX_LEN_UTF16` Constants)
 - rust-lang#132268 (Impl TryFrom<Vec<u8>> for String)
 - rust-lang#136093 (Match Ergonomics 2024: update old-edition behavior of feature gates)
 - rust-lang#136344 (Suggest replacing `.` with `::` in more error diagnostics.)
 - rust-lang#136690 (Use more explicit and reliable ptr select in sort impls)
 - rust-lang#136815 (CI: Stop /msys64/bin from being prepended to PATH in msys2 shell)
 - rust-lang#136923 (Lint `#[must_use]` attributes applied to methods in trait impls)
 - rust-lang#137155 (Organize `OsString`/`OsStr` shims)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu
Copy link
Member

Also tagging as T-compiler for beta backport nomination.
@rustbot label +T-compiler

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 21, 2025
@jieyouxu jieyouxu mentioned this pull request Mar 21, 2025
Open
@cuviper
Copy link
Member

cuviper commented Mar 22, 2025

We discussed the backport on zulip.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 22, 2025
@cuviper cuviper mentioned this pull request Mar 22, 2025
Merged
@cuviper cuviper modified the milestones: 1.87.0, 1.86.0 Mar 22, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 22, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2025
@bors
Auto merge of rust-lang#138817 - cuviper:beta-next, r=cuviper
7824ede 
[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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. O-windows-gnu Toolchain: GNU, Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

rustc.exe -vV didn't exit successfully (exit code: 0xc000007b) on i686-pc-windows-gnu
9 participants
@ChrisDenton @rustbot @bors @tgross35 @Kobzol @jieyouxu @cuviper @Mark-Simulacrum @workingjubilee