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

x.py: fixup 6130fc884bc1dff9bb835894a7bb2042c110b011, fix submodule handling #57082

Merged
merged 1 commit into from
Dec 24, 2018

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Dec 23, 2018

./x.py used to automatically check out the right commit when a submodule was outdated and ./x.py build was run
and submodules handling was enabled in config.toml (submodules = true).

But it threw an error:
[...]
failed to run: git submodule -q sync --progress src/tools/clippy

The commit removes the --progress from git submodule call.

Fixes #57080

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2018
@pietroalbini
Copy link
Member

@bors p=1

@matthiaskrgr
Copy link
Member Author

@pietroalbini could you p=2 (there's already a clippy update that has p=1 but it's less important imo) ^^

@pietroalbini
Copy link
Member

Right, didn't see that. The PR still has to be approved, so this might not be necessary.
@bors p=5

@clarfonthey
Copy link
Contributor

Oh, whoops, I didn't notice that. It worked when I ran it locally, so, I didn't bother testing it further.

Yeah, it should only be removed from the sync command.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 23, 2018

📌 Commit 4ad59b997979e481c57a2c87edd3c5c8e184dffb has been approved by estebank

@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 23, 2018
@pietroalbini
Copy link
Member

@estebank isn't it better to wait until #57082 (comment) is done?

@pietroalbini
Copy link
Member

@bors r-
Let's wait until --progress is only removed from sync.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 23, 2018
@matthiaskrgr matthiaskrgr changed the title Revert "Add --progress to git submodule commands" x.py: fixup 6130fc884bc1dff9bb835894a7bb2042c110b011, fix submodule handling Dec 24, 2018
./x.py used to automatically check out the right commit when a submodule was outdated and ./x.py build was run
and submodules handling was enabled in config.toml (submodules = true).

But it threw an error:
[...]
failed to run: git submodule -q sync --progress src/tools/clippy

The commit removes the --progress from git submodule call.

Fixes rust-lang#57080
@matthiaskrgr
Copy link
Member Author

I updated the PR to just fix the sync command.

@pietroalbini
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 24, 2018

📌 Commit 49eb1e5 has been approved by pietroalbini

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 24, 2018
@bors
Copy link
Contributor

bors commented Dec 24, 2018

⌛ Testing commit 49eb1e5 with merge f960f37...

bors added a commit that referenced this pull request Dec 24, 2018
x.py: fixup 6130fc8, fix submodule handling

./x.py used to automatically check out the right commit when a submodule was outdated and ./x.py build was run
and submodules handling was enabled in config.toml (submodules = true).

But it threw an error:
[...]
failed to run: git submodule -q sync --progress src/tools/clippy

The commit removes the --progress from git submodule call.

Fixes #57080
@bors
Copy link
Contributor

bors commented Dec 24, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing f960f37 to master...

@bors bors merged commit 49eb1e5 into rust-lang:master Dec 24, 2018
@matthiaskrgr matthiaskrgr deleted the revert_56933 branch February 29, 2020 14:13
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.

8 participants