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

honor XTASK_BIN in tools/install_*_prerequisites.sh #5860

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Jun 5, 2024

Merging #5482 introduced breakage I didn't account for: being able to run install_runner_prerequisites.sh without having Cargo available, which is used by the a4x2 testbed. This change introduces the XTASK_BIN environment variable which will be used instead of cargo xtask if set.

The companion PR in a4x2 is https://github.com/oxidecomputer/testbed/pull/49/files.

Tested that all these work:

  • ./tools/install_builder_prerequisites.sh -y
  • XTASK_BIN=target/debug/xtask ./tools/install_builder_prerequisites.sh -y (after building xtask)
  • XTASK_BIN=target/debug/nonexistent-file ./tools/install_builder_prerequisites.sh -y (correctly fails with ENOENT)

@iliana iliana requested a review from jgallagher June 5, 2024 21:40
@iliana
Copy link
Contributor Author

iliana commented Jun 5, 2024

(I also checked that there aren't any other shell scripts in the repo that call cargo xtask.)

Copy link
Contributor

@jgallagher jgallagher left a comment

Choose a reason for hiding this comment

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

Thank you!

@iliana iliana merged commit 01bc9ad into main Jun 6, 2024
19 checks passed
@iliana iliana deleted the iliana/xtask-bin branch June 6, 2024 00:30
Sign up for free to 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.

None yet

2 participants