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

Various version statement fixes #1822

Merged
merged 4 commits into from
May 1, 2019

Conversation

kinnison
Copy link
Contributor

@kinnison kinnison commented May 1, 2019

This PR rolls up an addition of a hidden flag/command to dump the version testament which can be used if in the future a user receives an unexpectedly unclean version of rustup-init.

We use that in the CI pipeline to dump the version which would be displayed so that we can check it during our stable release process.

Also this includes a commit to remove a dirtying step (or rather to clean up after it) in our appveyor builds.

kinnison added 4 commits May 1, 2019 08:58
In cases where users somehow get hold of versions of rustup which
are not cleanly built by CI, we need a way to find out what the
dirtiness was caused by.  This will let us do it either by:

$ rustup-init --dump-testament

or, once installed,

$ rustup dump-testament

Signed-off-by: Daniel Silverstone <[email protected]>
We were leaving a `rustup-init.exe` behind which dirtied the
git repository, meaning that the version number was unpleasant for
Windows users.  This fixes that.

Signed-off-by: Daniel Silverstone <[email protected]>
To allow us to ensure that we do not have unexpected version strings
due to dirty builds etc, dump the testament after the build but before
running the tests.  We can't do this for unusual cross-builds but
for the most part we can do it on at least one of each of our major
platforms.

Signed-off-by: Daniel Silverstone <[email protected]>
Once we've made the builds on stable, add a double-check step
to ensure that the version numbers reported by the various
built versions of `rustup-init` actually are the correct versions
as expected for the build.  Dirty git repos, missed updates, etc
will show here.

Signed-off-by: Daniel Silverstone <[email protected]>
@kinnison
Copy link
Contributor Author

kinnison commented May 1, 2019

Thanks for the review @lzutao

@kinnison kinnison merged commit 88473bc into rust-lang:master May 1, 2019
@kinnison kinnison deleted the version-statement branch May 1, 2019 10:27
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.

2 participants