Repository navigation
ci: fetch only the host's crates in the queue lane #1057
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,14 @@ out="${LANE_OUT:-/out}" | |
| work="${E2E_LANE_WORK:-/var/tmp/e2e-lane}" | ||
| channels="${E2E_CHANNELS:-release nightly}" | ||
|
|
||
| # The lane fetches only the host's crates, so a build target set from outside | ||
| # would need crates it skips and meet the network without a retry. Refused | ||
| # before anything is installed. This covers the environment variable only. | ||
| if [[ -n "${CARGO_BUILD_TARGET:-}" ]]; then | ||
| echo "CARGO_BUILD_TARGET is set; unset it: the lane fetches only the host's crates" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| export E2E_INCLUDE_NIGHTLY="${E2E_INCLUDE_NIGHTLY-1}" | ||
| export E2E_SERVE_TIMEOUT_SECS="${E2E_SERVE_TIMEOUT_SECS:-300}" | ||
|
|
||
|
|
@@ -158,10 +166,23 @@ bash .github/scripts/gpu-preflight.sh | |
| preflight_done=0 | ||
|
|
||
| # The two fetches in front of the build, each retried on its own. The first cargo | ||
| # call in this checkout downloads the toolchain rust-toolchain.toml names; then | ||
| # every crate is fetched, so the build below does not meet the network. | ||
| # call in this checkout downloads the toolchain rust-toolchain.toml names: that | ||
| # relies on rustup's proxy installing it on first call, and is a no-op where | ||
| # cargo is not rustup-managed. Then the crates are fetched, so the build below | ||
| # does not meet the network. Only the host's are: the build, the pre-warm and | ||
| # the suite all run on the host (see the CARGO_BUILD_TARGET check at the top). | ||
| retry 4 30 cargo --version | ||
| retry 4 30 cargo fetch --locked | ||
| # Captured first, so a cargo that fails here aborts the lane with its own error. | ||
| cargo_info="$(cargo -vV)" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: |
||
| host="" | ||
| while read -r key value; do | ||
| if [[ "${key}" == "host:" ]]; then host="${value}"; fi | ||
| done <<<"${cargo_info}" | ||
| if [[ -z "${host}" ]]; then | ||
| echo "cargo did not report its host triple" >&2 | ||
| exit 1 | ||
| fi | ||
| retry 4 30 cargo fetch --locked --target "${host}" | ||
|
tomastola marked this conversation as resolved.
Resolved
|
||
|
|
||
| # The e2e-test-hooks feature must match what `cargo xtask e2e` builds for | ||
| # itself; see the e2e-gpu job in e2e-selfhosted.yml. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment and PR body say the refusal happens before anything is installed, but the new test doesn't assert that no apt/curl/preflight stub ran. Consider asserting it so the claim is held by a test.