[beta] Automaticaly calculate beta prerelease numbers #47396

alexcrichton · Jan 12, 2018

This commit automatically calculates the beta prerelease number meaning we'll no
longer need to manually change the beta version. Instead beta will automatically
deploy any time a backport is merged, ensuring that backports are released for
testing ASAP. More details about this can be found on the internal forums

The only bit of trickiness here was that on CI we do shallow clones by default
but the git history probing here requires some more information. Do cope with
that this commit chooses the strategy of converting the repository to a full
clone via the --unshallow flag to git. That way this should work for local
developers as well as CI changes.

Note that this commit is coming first to the beta branch to test it, and if
successful we can go back and land it on master.

rust-highfive · Jan 12, 2018

r? @aturon

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

rust-highfive · Jan 12, 2018

Warning

Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

alexcrichton · Jan 12, 2018

r? @kennytm

shepmaster · Jan 13, 2018

FWIW code looks reasonable to me.

bors · Jan 13, 2018

☔️ The latest upstream changes (presumably #47399) made this pull request unmergeable. Please resolve the merge conflicts.

bors · Jan 13, 2018

🔒 Merge conflict

kennytm · Jan 13, 2018

kennytm reviewed Jan 13, 2018

View changes

kennytm · Jan 13, 2018

src/bootstrap/lib.rs

+            self.try_run_quiet(
+                Command::new("git")
+                    .arg("fetch")
+                    .arg("--unshallow"),


Since the bootstrap is running inside Docker where the repository is mount as read-only, I'm not sure if git fetch --unshallow will succeed.

This command may need to be run before the docker is built (before src/ci/docker/run.sh finishes), but it should only be run in the beta channel.

Gah right good point, what a bummer! I think I may try to fold this into the init_repo.sh script perhaps.

alexcrichton · Jan 13, 2018

re r? @kennytm

kennytm · Jan 13, 2018

Travis's still failing. Try git fetch origin --unshallow beta master?

kennytm · Jan 13, 2018

kennytm approved these changes Jan 13, 2018

View changes

r=me after Travis can successfully run tidy (or is green).

alexcrichton · Jan 14, 2018

@bors: r=kennytm

alright let's see if that works

bors · Jan 14, 2018

📌 Commit 41bd3ce has been approved by kennytm

kennytm · Jan 14, 2018

@bors r-

Travis is still failing

kennytm · Jan 14, 2018

kennytm reviewed Jan 14, 2018

View changes

kennytm · Jan 14, 2018

src/bootstrap/lib.rs

+                .arg("origin")
+                .arg("beta")
+        );
+        let beta = beta.trim().split(' ').next().unwrap();


Perhaps use split_whitespace() here. The parts are separated by tabs.

[00:02:47] fatal: Not a valid object name bb9be9ecc0b2501802e50a5c35be14e539be1638 refs/heads/beta [00:02:47] thread 'main' panicked at 'command did not execute successfully: "git" "merge-base" "bb9be9ecc0b2501802e50a5c35be14e539be1638\trefs/heads/beta" "e6072a7b3835f1875e81c9fd27799f9b20a0770c\trefs/heads/master"

alexcrichton · Jan 14, 2018

@bors: r=kennytm

Oops indeed!

bors · Jan 14, 2018

📌 Commit a57032f has been approved by kennytm

kennytm · Jan 14, 2018

kennytm reviewed Jan 14, 2018

View changes

kennytm · Jan 14, 2018

src/bootstrap/lib.rs

@@ -346,6 +348,7 @@ impl Build {

    /// Executes the entire build, as configured by the flags and configuration.
    pub fn build(&mut self) {
+        println!("{}", self.beta_prerelease_version());


This is not essential, but maybe remove this println!?

Er sorry yeah that was just debugging

alexcrichton · Jan 14, 2018

@bors: r=kennytm

bors · Jan 14, 2018

📌 Commit 9426dda has been approved by kennytm

kennytm · Jan 17, 2018

@bors p=4

bors · Jan 17, 2018

⌛️ Testing commit 9426dda with merge 3732f64...

bors · Jan 18, 2018

💔 Test failed - status-travis

alexcrichton · Jan 18, 2018

@bors: retry

[01:42:02] test [run-pass] run-pass/zero-sized-linkedlist-push.rs has been running for over 60 seconds

[01:42:02] test [run-pass] run-pass/zero-sized-tuple-struct.rs has been running for over 60 seconds



No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received

I think those macs are having a bad day...

bors · Jan 18, 2018

⌛️ Testing commit 9426dda with merge 597549e...

bors · Jan 18, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 597549e to beta...

rust-highfive assigned aturon Jan 12, 2018

rust-highfive assigned kennytm and unassigned aturon Jan 12, 2018

shepmaster added the S-waiting-on-review label Jan 13, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch 2 times, most recently from edd1a2f to 8152a1c Jan 13, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch from 8152a1c to 41bd3ce Jan 14, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch from 41bd3ce to a57032f Jan 14, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch from a57032f to 9426dda Jan 14, 2018

kennytm added the S-waiting-on-bors label Jan 14, 2018

kennytm removed the S-waiting-on-review label Jan 14, 2018

bors merged commit 9426dda into rust-lang:beta Jan 18, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

kennytm referenced this pull request Jan 18, 2018
Closed
Spurious macOS 30-minute timeout when compiling stage0-rustc #47539

alexcrichton deleted the alexcrichton:beta-next branch Jan 18, 2018

alexcrichton referenced this pull request Jan 18, 2018
Closed
[beta] Attempt to fix prerelease version calculation #47546

rust-lang/rust

Join GitHub today

[beta] Automaticaly calculate beta prerelease numbers #47396

Conversation

alexcrichton commented Jan 12, 2018

rust-highfive assigned aturon Jan 12, 2018

This comment has been minimized.

rust-highfive commented Jan 12, 2018

This comment has been minimized.

rust-highfive commented Jan 12, 2018

This comment has been minimized.

alexcrichton commented Jan 12, 2018

rust-highfive assigned kennytm and unassigned aturon Jan 12, 2018

This comment has been minimized.

shepmaster commented Jan 13, 2018

shepmaster added the S-waiting-on-review label Jan 13, 2018

This comment has been minimized.

bors commented Jan 13, 2018

This comment has been minimized.

bors commented Jan 13, 2018

kennytm reviewed Jan 13, 2018 View changes

This comment has been minimized.

kennytm Jan 13, 2018 • edited

This comment has been minimized.

alexcrichton Jan 13, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch 2 times, most recently from edd1a2f to 8152a1c Jan 13, 2018

This comment has been minimized.

alexcrichton commented Jan 13, 2018

This comment has been minimized.

kennytm commented Jan 13, 2018

kennytm approved these changes Jan 13, 2018 View changes

kennytm left a comment

alexcrichton force-pushed the alexcrichton:beta-next branch from 8152a1c to 41bd3ce Jan 14, 2018

This comment has been minimized.

alexcrichton commented Jan 14, 2018

This comment has been minimized.

bors commented Jan 14, 2018

This comment has been minimized.

kennytm commented Jan 14, 2018

kennytm reviewed Jan 14, 2018 View changes

This comment has been minimized.

kennytm Jan 14, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch from 41bd3ce to a57032f Jan 14, 2018

This comment has been minimized.

alexcrichton commented Jan 14, 2018

This comment has been minimized.

bors commented Jan 14, 2018

kennytm reviewed Jan 14, 2018 View changes

This comment has been minimized.

kennytm Jan 14, 2018

This comment has been minimized.

alexcrichton Jan 14, 2018

alexcrichton force-pushed the alexcrichton:beta-next branch from a57032f to 9426dda Jan 14, 2018

This comment has been minimized.

alexcrichton commented Jan 14, 2018

This comment has been minimized.

bors commented Jan 14, 2018

kennytm added the S-waiting-on-bors label Jan 14, 2018

kennytm removed the S-waiting-on-review label Jan 14, 2018

This comment has been minimized.

kennytm commented Jan 17, 2018

This comment has been minimized.

bors commented Jan 17, 2018

bors added a commit that referenced this pull request Jan 17, 2018

This comment has been minimized.

bors commented Jan 18, 2018

This comment has been minimized.

alexcrichton commented Jan 18, 2018

This comment has been minimized.

bors commented Jan 18, 2018

bors added a commit that referenced this pull request Jan 18, 2018

This comment has been minimized.

bors commented Jan 18, 2018

Hide details View details bors merged commit 9426dda into rust-lang:beta Jan 18, 2018 2 checks passed

2 checks passed

kennytm referenced this pull request Jan 18, 2018

Spurious macOS 30-minute timeout when compiling stage0-rustc #47539

alexcrichton deleted the alexcrichton:beta-next branch Jan 18, 2018

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 18, 2018

alexcrichton referenced this pull request Jan 18, 2018

kennytm reviewed Jan 13, 2018

View changes

kennytm Jan 13, 2018 •

edited

alexcrichton force-pushed the alexcrichton:beta-next branch 2 times, most recently from `edd1a2f` to `8152a1c` Jan 13, 2018

kennytm approved these changes Jan 13, 2018

View changes

alexcrichton force-pushed the alexcrichton:beta-next branch from `8152a1c` to `41bd3ce` Jan 14, 2018

kennytm reviewed Jan 14, 2018

View changes

alexcrichton force-pushed the alexcrichton:beta-next branch from `41bd3ce` to `a57032f` Jan 14, 2018

kennytm reviewed Jan 14, 2018

View changes

alexcrichton force-pushed the alexcrichton:beta-next branch from `a57032f` to `9426dda` Jan 14, 2018

bors merged commit `9426dda` into rust-lang:beta Jan 18, 2018
2 checks passed