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 the thing. #34

Merged
merged 2 commits into from
May 5, 2021
Merged

Fix the thing. #34

merged 2 commits into from
May 5, 2021

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented May 5, 2021

The ci has been failing for about a month. Turns out this was cause by two problems, which this PR fixes:

  1. There's a commit with r=<try> in the history of rust-lang/rust, because of critical: a try build can trigger a merge to master homu#47. That caused an error, because < and > are not acceptable in usernames.

  2. At some point in time the rustfmt submodule refers to commit 939e164c29f92bdbffdb156fa3d53aabbe9a2e0b. That commit is not included under any tag or branch in the rustfmt repo. The ugly workaround is to run git fetch origin <id> when a commit is missing.

@Mark-Simulacrum
Copy link
Member

At some point in time the rustfmt submodule refers to commit 939e164c29f92bdbffdb156fa3d53aabbe9a2e0b. That commit is not included under any tag or branch in the rustfmt repo. The ugly workaround is to run git fetch origin when a commit is missing.

Created https://github.com/rust-lang/rustfmt/tree/backup-stray-commit-2021-05-05 from that commit, but seems good to have the underlying bugfix regardless.

I didn't even notice CI was failing, good catch.

@Mark-Simulacrum Mark-Simulacrum merged commit c732b50 into rust-lang:master May 5, 2021
@m-ou-se m-ou-se deleted the fix branch May 5, 2021 17:16
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.

None yet

2 participants