[beta] Automaticaly calculate beta prerelease numbers by alexcrichton · Pull Request #47396 · rust-lang/rust

alexcrichton · 2018-01-12T20:56:43Z

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 · 2018-01-12T20:56:46Z

r? @aturon

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

rust-highfive · 2018-01-12T20:56:47Z

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 · 2018-01-12T20:56:50Z

r? @kennytm

shepmaster · 2018-01-13T00:28:22Z

FWIW code looks reasonable to me.

bors · 2018-01-13T02:15:21Z

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

bors · 2018-01-13T07:29:59Z

🔒 Merge conflict

kennytm · 2018-01-13T07:34:26Z

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 · 2018-01-13T19:08:47Z

re r? @kennytm

kennytm · 2018-01-13T19:36:11Z

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

kennytm

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

alexcrichton · 2018-01-14T00:06:53Z

@bors: r=kennytm

alright let's see if that works

bors · 2018-01-14T00:06:54Z

📌 Commit 41bd3ce has been approved by kennytm

kennytm · 2018-01-14T06:04:45Z

@bors r-

Travis is still failing

kennytm · 2018-01-14T06:05:48Z

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 · 2018-01-14T06:13:09Z

@bors: r=kennytm

Oops indeed!

bors · 2018-01-14T06:13:10Z

📌 Commit a57032f has been approved by kennytm

kennytm · 2018-01-14T06:24:08Z

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

Er sorry yeah that was just debugging

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. [forums]: https://internals.rust-lang.org/t/tweaking-how-betas-are-produced/6526

alexcrichton · 2018-01-14T06:34:50Z

@bors: r=kennytm

bors · 2018-01-14T06:34:51Z

📌 Commit 9426dda has been approved by kennytm

kennytm · 2018-01-17T11:28:41Z

@bors p=4

bors · 2018-01-17T23:30:28Z

⌛ Testing commit 9426dda with merge 3732f64354c3b77ee728a0797a1a496724d47eea...

bors · 2018-01-18T01:56:07Z

💔 Test failed - status-travis

alexcrichton · 2018-01-18T01:59:57Z

@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 · 2018-01-18T04:57:06Z

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

[beta] Automaticaly calculate beta prerelease numbers 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. [forums]: https://internals.rust-lang.org/t/tweaking-how-betas-are-produced/6526

bors · 2018-01-18T07:53:23Z

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

We got rust-lang#47396 merged but it looks like rcs failed to deploy the beta because when it tried to calculate the beta version its cwd was different. Let's try to fix this bug and fix auto-deploy by explicitly setting the `current_dir` for git commands.

rust-highfive assigned aturon Jan 12, 2018

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

shepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2018

kennytm reviewed Jan 13, 2018
View reviewed changes

alexcrichton force-pushed the beta-next branch 2 times, most recently from edd1a2f to 8152a1cCompare January 13, 2018 19:08

kennytm approved these changes Jan 13, 2018
View reviewed changes

alexcrichton force-pushed the beta-next branch from 8152a1c to 41bd3ceCompare January 14, 2018 00:06

kennytm reviewed Jan 14, 2018
View reviewed changes

alexcrichton force-pushed the beta-next branch from 41bd3ce to a57032fCompare January 14, 2018 06:12

kennytm reviewed Jan 14, 2018
View reviewed changes

alexcrichton force-pushed the beta-next branch from a57032f to 9426ddaCompare January 14, 2018 06:34

kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 14, 2018

kennytm removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 14, 2018

bors merged commit 9426dda into rust-lang:betaJan 18, 2018

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

alexcrichton deleted the beta-next branch January 18, 2018 15:07

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

Uh oh!

Uh oh!

Conversation

alexcrichton commented Jan 12, 2018

Uh oh!

rust-highfive commented Jan 12, 2018

Uh oh!

rust-highfive commented Jan 12, 2018

Uh oh!

alexcrichton commented Jan 12, 2018

Uh oh!

shepmaster commented Jan 13, 2018

Uh oh!

bors commented Jan 13, 2018

Uh oh!

bors commented Jan 13, 2018

Uh oh!

kennytmJan 13, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexcrichtonJan 13, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jan 13, 2018

Uh oh!

kennytm commented Jan 13, 2018

Uh oh!

kennytm left a comment

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jan 14, 2018

Uh oh!

bors commented Jan 14, 2018

Uh oh!

kennytm commented Jan 14, 2018

Uh oh!

kennytmJan 14, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jan 14, 2018

Uh oh!

bors commented Jan 14, 2018

Uh oh!

kennytmJan 14, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichtonJan 14, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Jan 14, 2018

Uh oh!

bors commented Jan 14, 2018

Uh oh!

kennytm commented Jan 17, 2018

Uh oh!

bors commented Jan 17, 2018

Uh oh!

bors commented Jan 18, 2018

Uh oh!

alexcrichton commented Jan 18, 2018

Uh oh!

bors commented Jan 18, 2018

Uh oh!

bors commented Jan 18, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

kennytmJan 13, 2018•
edited
Loading