Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

[Merged by Bors] - chore(*): revert #17048#17733

Closed
kim-em wants to merge 9 commits intomasterfrom
revert_17048
Closed

[Merged by Bors] - chore(*): revert #17048#17733
kim-em wants to merge 9 commits intomasterfrom
revert_17048

Conversation

@kim-em
Copy link
Copy Markdown
Collaborator

@kim-em kim-em commented Nov 27, 2022

This had merge conflicts which I've been rather reckless about resolving. Let's see what CI says.


Open in Gitpod

@kim-em kim-em added the awaiting-CI The author would like to see what CI has to say before doing more work. label Nov 27, 2022
@kim-em kim-em requested a review from a team as a code owner November 27, 2022 04:50
@github-actions github-actions bot removed the awaiting-CI The author would like to see what CI has to say before doing more work. label Nov 28, 2022
@j-loreaux
Copy link
Copy Markdown
Collaborator

maintainer merge

@github-actions
Copy link
Copy Markdown

🚀 Pull request has been placed on the maintainer queue by j-loreaux.

@sgouezel
Copy link
Copy Markdown
Collaborator

bors r+

@github-actions github-actions bot added the ready-to-merge All that is left is for bors to build and merge this PR. (Remember you need to say `bors r+`.) label Nov 28, 2022
bors bot pushed a commit that referenced this pull request Nov 28, 2022
This had merge conflicts which I've been rather reckless about resolving. Let's see what CI says.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Jireh Loreaux <loreaujy@gmail.com>
@bors
Copy link
Copy Markdown

bors bot commented Nov 28, 2022

Build failed (retrying...):

@kim-em
Copy link
Copy Markdown
Collaborator Author

kim-em commented Nov 28, 2022

bors p=37

bors bot pushed a commit that referenced this pull request Nov 28, 2022
This had merge conflicts which I've been rather reckless about resolving. Let's see what CI says.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Jireh Loreaux <loreaujy@gmail.com>
@bors
Copy link
Copy Markdown

bors bot commented Nov 28, 2022

Build failed:

@kim-em
Copy link
Copy Markdown
Collaborator Author

kim-em commented Nov 28, 2022

It looks like that was a transient error with polyrith talking to the outside world.

bors p=37

bors merge

bors bot pushed a commit that referenced this pull request Nov 28, 2022
This had merge conflicts which I've been rather reckless about resolving. Let's see what CI says.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Jireh Loreaux <loreaujy@gmail.com>
@bors
Copy link
Copy Markdown

bors bot commented Nov 28, 2022

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title chore(*): revert #17048 [Merged by Bors] - chore(*): revert #17048 Nov 28, 2022
@bors bors bot closed this Nov 28, 2022
@bors bors bot deleted the revert_17048 branch November 28, 2022 23:10
bors bot pushed a commit to leanprover-community/mathlib4 that referenced this pull request Dec 2, 2022
mathlib3 SHA: 8c53048add6ffacdda0b36c4917bfe37e209b0ba

- [x] depends on #563
- [x] depends on leanprover-community/mathlib3#17733
- [x] depends on leanprover/lean4#1901
- [x] depends on leanprover/lean4#1907

Co-authored-by: Winston Yin <winstonyin@gmail.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Jireh Loreaux <loreaujy@gmail.com>
Co-authored-by: Ruben Van de Velde <65514131+Ruben-VandeVelde@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

ready-to-merge All that is left is for bors to build and merge this PR. (Remember you need to say `bors r+`.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants