Skip to content

tools: work around breaking change in rustup 1.28.0 - #191

Merged
jclulow merged 2 commits into
masterfrom
iliana/rustup-1.28.0
Mar 3, 2025
Merged

tools: work around breaking change in rustup 1.28.0#191
jclulow merged 2 commits into
masterfrom
iliana/rustup-1.28.0

Conversation

@iliana

Copy link
Copy Markdown
Contributor

This works around rust-lang/rustup#3985. Tested via Omicron's cargo xtask releng.

@iliana
iliana requested a review from jclulowMarch 3, 2025 18:34
Comment threadtools/helios-build/src/main.rs Outdated
.args(["show", "active-toolchain"])
.current_dir(pwd.as_ref())
.stdin(Stdio::null())
.stdout(Stdio::null())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to capture and log this instead?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In an ideal world where I'm not trying to perform an emergency fix to Omicron CI, maybe!

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output is not particularly useful, it just shows the current toolchain and where the override comes from, if any. The stderr is left in place, so that's logged to the console whenever an error occurs (including when the toolchain is not installed).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally makes sense

sunshowers
sunshowers previously approved these changes Mar 3, 2025
@jclulowjclulow changed the title work around breaking change in rustup 1.28.0tools: work around breaking change in rustup 1.28.0Mar 3, 2025
@jclulow

Copy link
Copy Markdown
Collaborator

These things have a habit of sticking around so I did the logging part and pushed it onto the branch. Does that look alright?

It produces log messages that look like:

Mar 03 19:04:42.036 INFO building project "image-builder" ok (0 seconds)
Mar 03 19:04:42.036 INFO checking rust toolchain is installed for "/ws/helios/projects/pinprick"
Mar 03 19:04:42.063 INFO rust toolchain for "/ws/helios/projects/pinprick": "stable-x86_64-unknown-illumos\nactive because: it's the default toolchain"
Mar 03 19:04:42.063 INFO building project "pinprick" at /ws/helios/projects/pinprick
Mar 03 19:04:42.063 INFO exec: ["cargo", "build", "--locked", "--release"], pwd: Some("/ws/helios/projects/pinprick")

@iliana

Copy link
Copy Markdown
ContributorAuthor

Looks fine to me! Apparently I'm not allowed to approve my own PR and new changes require approval from someone other than the last pusher.

@jclulow

Copy link
Copy Markdown
Collaborator

githuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuub

@jclulow
jclulow merged commit c278c40 into masterMar 3, 2025
@iliana
iliana deleted the iliana/rustup-1.28.0 branch March 3, 2025 19:14
iliana added a commit that referenced this pull request Mar 4, 2025
Co-authored-by: Joshua M. Clulow <jmc@oxide.computer>
Original-Commit: c278c40
@morlandi7morlandi7 added this to the 13 milestone Mar 5, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@iliana@jclulow@sunshowers@papertigers@morlandi7