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

Fix toolstate history format #67432

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Dec 19, 2019

We were inserting before the existing newline, so we should prepend it
not append it to our inserted string.

We were inserting *before* the existing newline, so we should prepend it
not append it to our inserted string.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 19, 2019
@Centril
Copy link
Contributor

Centril commented Dec 19, 2019

Let's rubber-stamp & see if it fixes things.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 19, 2019

📌 Commit 1787b2b has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 19, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 19, 2019
…ntril

Fix toolstate history format

We were inserting *before* the existing newline, so we should prepend it
not append it to our inserted string.
Centril added a commit to Centril/rust that referenced this pull request Dec 19, 2019
…ntril

Fix toolstate history format

We were inserting *before* the existing newline, so we should prepend it
not append it to our inserted string.
bors added a commit that referenced this pull request Dec 19, 2019
Rollup of 3 pull requests

Successful merges:

 - #67351 (Set release channel on non-dist builders)
 - #67426 (Rollup of 7 pull requests)
 - #67432 (Fix toolstate history format)

Failed merges:

r? @ghost
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 19, 2019
…ntril

Fix toolstate history format

We were inserting *before* the existing newline, so we should prepend it
not append it to our inserted string.
bors added a commit that referenced this pull request Dec 19, 2019
Rollup of 3 pull requests

Successful merges:

 - #67351 (Set release channel on non-dist builders)
 - #67426 (Rollup of 7 pull requests)
 - #67432 (Fix toolstate history format)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-12-19T18:50:19.7531310Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-19T18:50:19.7543506Z ##[command]git config gc.auto 0
2019-12-19T18:50:19.7545371Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-19T18:50:19.7546886Z ##[command]git config --get-all http.proxy
2019-12-19T18:50:19.7614500Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67432/merge:refs/remotes/pull/67432/merge
---
2019-12-19T19:00:32.2664211Z configure: build.locked-deps    := True
2019-12-19T19:00:32.2664272Z configure: llvm.ccache          := sccache
2019-12-19T19:00:32.2664466Z configure: build.cargo-native-static := True
2019-12-19T19:00:32.2664652Z configure: dist.missing-tools   := True
2019-12-19T19:00:32.2664902Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2019-12-19T19:00:32.2664996Z configure: writing `config.toml` in current directory
2019-12-19T19:00:32.2665053Z configure: 
2019-12-19T19:00:32.2665280Z configure: run `python /checkout/x.py --help`
2019-12-19T19:00:32.2665324Z configure: 
---
2019-12-19T19:09:07.9230770Z Build completed successfully in 0:01:43
2019-12-19T19:09:07.9239930Z + /scripts/validate-toolstate.sh
2019-12-19T19:09:07.9301747Z Cloning into 'rust-toolstate'...
2019-12-19T19:09:08.4800738Z Traceback (most recent call last):
2019-12-19T19:09:08.4801464Z   File "../../src/tools/publish_toolstate.py", line 303, in <module>
2019-12-19T19:09:08.4801894Z     cur_datetime
2019-12-19T19:09:08.4801993Z   File "../../src/tools/publish_toolstate.py", line 182, in update_latest
2019-12-19T19:09:08.4802657Z     for os in ['windows', 'linux']
2019-12-19T19:09:08.4802791Z   File "../../src/tools/publish_toolstate.py", line 182, in <dictcomp>
2019-12-19T19:09:08.4803003Z     for os in ['windows', 'linux']
2019-12-19T19:09:08.4803053Z   File "../../src/tools/publish_toolstate.py", line 111, in read_current_status
2019-12-19T19:09:08.4803287Z     (commit, status) = line.split('\t', 1)
2019-12-19T19:09:08.4803340Z ValueError: need more than 1 value to unpack
2019-12-19T19:09:08.4850113Z   local time: Thu Dec 19 19:09:08 UTC 2019
2019-12-19T19:09:08.7477272Z   network time: Thu, 19 Dec 2019 19:09:08 GMT
2019-12-19T19:09:08.7481638Z == end clock drift check ==
2019-12-19T19:09:10.7489649Z 
2019-12-19T19:09:10.7489649Z 
2019-12-19T19:09:10.7645878Z ##[error]Bash exited with code '1'.
2019-12-19T19:09:10.7681477Z ##[section]Starting: Checkout
2019-12-19T19:09:10.7683449Z ==============================================================================
2019-12-19T19:09:10.7683525Z Task         : Get sources
2019-12-19T19:09:10.7683573Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 19, 2019
…ntril

Fix toolstate history format

We were inserting *before* the existing newline, so we should prepend it
not append it to our inserted string.
bors added a commit that referenced this pull request Dec 19, 2019
Rollup of 6 pull requests

Successful merges:

 - #67253 (Add more delegations to the fmt docs and add doctests)
 - #67281 (add string.insert benchmarks)
 - #67351 (Set release channel on non-dist builders)
 - #67421 (Fix internal documentation typo)
 - #67432 (Fix toolstate history format)
 - #67436 (Correct the todo! stabilization version)

Failed merges:

r? @ghost
@bors bors merged commit 1787b2b into rust-lang:master Dec 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants