Read beta version from the version file if building from a source tarball#111770
Merged
bors merged 2 commits intorust-lang:masterfrom May 21, 2023
Merged
Read beta version from the version file if building from a source tarball#111770bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
|
r? @ozkanonur (rustbot has picked a reviewer for you, use r? to override) |
jyn514
reviewed
May 20, 2023
Member
jyn514
left a comment
There was a problem hiding this comment.
Could you also please make the change I suggested on Zulip, to change Build::release to call beta_prerelease_version even when building from a source tarball?
86a80e3 to
5069d40
Compare
Contributor
Author
Done. Changed the condition to use |
This comment has been minimized.
This comment has been minimized.
5069d40 to
2f042ca
Compare
onur-ozkan
reviewed
May 20, 2023
2f042ca to
2bd3515
Compare
This comment has been minimized.
This comment has been minimized.
onur-ozkan
reviewed
May 20, 2023
... if building from a source tarball
2bd3515 to
6013d92
Compare
Contributor
|
This LGTM.
r=me once this is resolved by @jyn514 |
This comment has been minimized.
This comment has been minimized.
6013d92 to
343a0bf
Compare
Member
|
This looks great, thanks! @bors r=ozkanonur rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 21, 2023
…=ozkanonur Read beta version from the version file if building from a source tarball This pull request changes the `bootstrap` behaviour so that when building `rustc` from a source tarball, the beta revision number is correctly read from the `version` file instead of erroring out by invoking `git`. The `version` file is observed to only exist in the official source tarball and has the following format: ``` 1.70.0-beta.4 (2013813 2023-05-07) ```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#111745 (Fix overflow in error emitter) - rust-lang#111770 (Read beta version from the version file if building from a source tarball) - rust-lang#111797 (Migrate GUI colors test to original CSS color format) - rust-lang#111809 (Unset MIRI_BLESS for mir-opt-level 4 miri tests) - rust-lang#111817 (Migrate GUI colors test to original CSS color format) r? `@ghost` `@rustbot` modify labels: rollup
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
6 participants
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.
This pull request changes the
bootstrapbehaviour so that when buildingrustcfrom a source tarball, the beta revision number is correctly read from theversionfile instead of erroring out by invokinggit.The
versionfile is observed to only exist in the official source tarball and has the following format: