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

[beta] Prepare the 1.18.0 beta release #41525

Merged
merged 1 commit into from
Apr 25, 2017
Merged

Conversation

alexcrichton
Copy link
Member

  • Update the cargo submodule
  • Update the stage0 bootstrap compiler, temporarily downloading it from
    dev-static.rust-lang.org until it's released this Thursday.
  • Update release channel being compiled to beta
  • Disable the RLS release (will only happen on this one beta release)

* Update the cargo submodule
* Update the stage0 bootstrap compiler, temporarily downloading it from
  dev-static.rust-lang.org until it's released this Thursday.
* Update release channel being compiled to beta
* Disable the RLS release (will only happen on this one beta release)
@rust-highfive
Copy link
Collaborator

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@@ -201,8 +201,8 @@ def download_stage0(self):
if self.cargo().startswith(self.bin_root()) and \
(not os.path.exists(self.cargo()) or self.cargo_out_of_date()):
self.print_what_it_means_to_bootstrap()
filename = "cargo-{}-{}.tar.gz".format(channel, self.build)
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
filename = "cargo-{}-{}.tar.gz".format('0.18.0', self.build)
Copy link
Member Author

Choose a reason for hiding this comment

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

Note that this is a bit of an unfortunate hack, I'll try to clean it up on the master branch so we don't have to do this again. This version number should be configured in src/stage0.txt

@@ -171,7 +171,7 @@ def download_stage0(self):
if os.path.exists(self.bin_root()):
shutil.rmtree(self.bin_root())
filename = "rust-std-{}-{}.tar.gz".format(channel, self.build)
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
url = "https://dev-static.rust-lang.org/dist/" + self.stage0_rustc_date()
Copy link
Member Author

Choose a reason for hiding this comment

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

This is sort of up in the air as a convention. The old buildbot code would deploy to the archives and then we'd manually do the full release (change the manifests and put artifacts at dist/*.tar.gz. Now with rust-central-station nothing goes to prod on stable until we run the command manually. That means that until we actually do the release we wouldn't be able to create a new beta and/or nightly.

I'm personally thinking:

  • We create a new stable build
  • Stable uploads to dev
  • Create a new beta bootstrapping from dev
  • Beta is uploaded to prod
  • Create a new nightly bootstrapping from beta (on prod)
  • Do a release
  • Send a PR to beta to bootstrap from prod

One extra PR but allows us to get beta/nightlies sooner, which I sorta like. Thoughts @brson?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's unfortunate to make dev-static part of the public history, but for now fine, and I don't want to care too much.

@brson
Copy link
Contributor

brson commented Apr 25, 2017

@bors r+

This is a lot of churn for a mechanical bump. Needs some streamlining. Just the URLs I guess.

@bors
Copy link
Contributor

bors commented Apr 25, 2017

📌 Commit c430eff has been approved by brson

@bors
Copy link
Contributor

bors commented Apr 25, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Apr 25, 2017

📌 Commit c430eff has been approved by brson

@alexcrichton
Copy link
Member Author

@bors: p=100

@bors
Copy link
Contributor

bors commented Apr 25, 2017

⌛ Testing commit c430eff with merge 4dce672...

bors added a commit that referenced this pull request Apr 25, 2017
[beta] Prepare the 1.18.0 beta release

* Update the cargo submodule
* Update the stage0 bootstrap compiler, temporarily downloading it from
  dev-static.rust-lang.org until it's released this Thursday.
* Update release channel being compiled to beta
* Disable the RLS release (will only happen on this one beta release)
@bors
Copy link
Contributor

bors commented Apr 25, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: brson
Pushing 4dce672 to beta...

@bors bors merged commit c430eff into rust-lang:beta Apr 25, 2017
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.

4 participants