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

chore: port latest fixes from nightly-testing #97

Closed
wants to merge 10 commits into from

Conversation

kim-em
Copy link
Collaborator

@kim-em kim-em commented Jan 20, 2024

These are fixes on the nightly-testing branch, mostly due to @JLimperg. This PR is merging them into the bump/v4.6.0 release ready for the end of the month.

(@JLimperg, even though these are your changes, can I leave this PR to you to sanity check and merge?)

@JLimperg
Copy link
Collaborator

Can I instead rebase nightly-testing and bump/v4.6.0 onto master? Or will that mess up your setup?

@kim-em
Copy link
Collaborator Author

kim-em commented Jan 22, 2024

That should be fine. The only important invariant is that bump/v4.6.0 always works, and all content on it has been reviewed.

(In particular, no bots interact with aesop at all. If Mathlib's bump/v4.6.0 or nightly-testing branch need lake update aesop, that happens manually.)

@JLimperg JLimperg force-pushed the bump/v4.6.0 branch 2 times, most recently from eb8f6e3 to 7a0082b Compare January 23, 2024 12:32
mathlib-bors bot pushed a commit to leanprover-community/mathlib4 that referenced this pull request Jan 24, 2024
This is a PR to `bump/v4.6.0`, incorporating the changes on `nightly-testing` up to `nightly-2024-01-22`.

Note that for now this moves `aesop` to the `nightly-testing` branch. Once leanprover-community/aesop#97 lands we can move this back to `bump/v4.6.0`. This PR doesn't need to wait on that, however.



Co-authored-by: Scott Morrison <[email protected]>
@JLimperg
Copy link
Collaborator

As discussed on Zulip, I rebased and force-pushed bump/v4.6.0 so that it contains essentially the contents of this PR. The only non-cosmetic remaining difference is that bump/v4.6.0 depends on std@bump/v4.6.0 at a later commit than this PR.

@JLimperg JLimperg closed this Jan 24, 2024
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.

3 participants