Avoid trusting bootstrap for git-hash availability for the version-verbose-commit-hash test#137039
Closed
jieyouxu wants to merge 5 commits into
Closed
Avoid trusting bootstrap for git-hash availability for the version-verbose-commit-hash test#137039jieyouxu wants to merge 5 commits into
version-verbose-commit-hash test#137039jieyouxu wants to merge 5 commits into
Conversation
Previously, `tests/run-make/version-verbose-commit-hash` relied upon information from *bootstrap* to determine if git-hash was available. However, this is flawed: if bootstrap's git-hash logic fails, the test that tries to check that the rustc is built with git-hash information may never run, because it's gated via `//@ needs-git-hash` that trusts bootstrap's information! Instead, we have to bypass bootstrap and communicate between CI jobs and the run-make test directly.
- No longer gate by `//@ needs-git-hash`. Instead, check for `COMPILETEST_HAS_GIT_HASH=1` env var being set. - Document the env var and reason for bypassing bootstrap.
Collaborator
|
r? @onur-ozkan rustbot has assigned @onur-ozkan. Use |
Member
Author
Member
Author
|
I'll rethink this approach. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Caution
Blocked on:
ci.pyrewrite: Rewrite theci.pyscript in Rust #136864COMPILETEST_HAS_GIT_HASH=1when under CI conditions.Summary
tests/run-make/version-verbose-commit-hashtest.{rustc,rustdoc}that had omitted git hash info.Testing
Manually tested locally:
COMPILETEST_HAS_GIT_HASH=1 ./x test tests/run-make/version-verbose-commit-hashwith compiler profile +rust.channeldefaulted todevcauses test to fail because no git hash info.COMPILETEST_HAS_GIT_HASH=1 ./x test tests/run-make/version-verbose-commit-hashwith compiler profile +rust.channel=nightlypasses test.Review advice
COMPILETEST_HAS_GIT_HASH=1is correctly set in CI.Fixes #132875.