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.

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

CI: be compatible with both Rustup pre-1.28.0 and 1.28.0 #13944

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

samueltardieu
Copy link
Contributor

@samueltardieu samueltardieu commented Jan 4, 2025

rustup show active-toolchain will no longer install the default toolchain starting from Rustup 1.28.0, and rustup toolchain install without extra arguments is not supported in Rustup pre-1.28.0.

The Rustup change and proposed solution is described in https://internals.rust-lang.org/t/seeking-beta-testers-for-rustup-v1-28-0/22060.

changelog: none

@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2025

r? @flip1995

rustbot has assigned @flip1995.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jan 4, 2025
@ehuss
Copy link
Contributor

ehuss commented Jan 4, 2025

I think the TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ') line will also need to be updated (the new output includes multiple lines instead of one).

`rustup show active-toolchain` will no longer install the default
toolchain starting from Rustup 1.28.0, and `rustup toolchain install`
without extra arguments is not supported in Rustup pre-1.28.0.
@samueltardieu
Copy link
Contributor Author

I think the TOOLCHAIN=$(rustup show active-toolchain | cut -f1 -d' ') line will also need to be updated (the new output includes multiple lines instead of one).

Right, I've now limited the output to the first line, which should give equivalent results, thanks.

@flip1995 flip1995 added this pull request to the merge queue Jan 7, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 7, 2025
@samueltardieu
Copy link
Contributor Author

@flip1995 I added the missing changelog. I'll add an item to my todo list: to check the presence of a changelog line in the PR check, and not wait until the merge, I'll submit a later PR about this.

@flip1995
Copy link
Member

flip1995 commented Jan 7, 2025

I'll add an item to my todo list: to check the presence of a changelog line in the PR check, and not wait until the merge

That would be great!

It should only involve moving this check from the clippy_mq.yaml to the clippy_pr.yaml file IIRC.

@flip1995 flip1995 added this pull request to the merge queue Jan 7, 2025
Merged via the queue into rust-lang:master with commit 4ef9177 Jan 7, 2025
9 checks passed
@samueltardieu samueltardieu deleted the push-oplzxtnqsvtk branch January 10, 2025 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants