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

Merge v2.1.1 into master #2473

Merged
merged 327 commits into from
Sep 7, 2024
Merged

Merge v2.1.1 into master #2473

merged 327 commits into from
Sep 7, 2024

Conversation

MatthewDaggitt
Copy link
Contributor

This brings across all the changes on experimental and v2.1.1-release branches onto master. Therefore after this is merged everyone working on the library will need to update to v2.7.0 of Agda.

Saransh-cpp and others added 30 commits July 10, 2024 10:43
* Simplify more `Data.Product` import to `Data.Product.Base`

* Simplify more `Data.Product` import to `Data.Product.Base`

* Indent
A useful improvement to consistency of names,
* `find*` functions for `Data.List`

both decidable predicate and boolean function variants

* Back to `Maybe.map`

* New type for findIndices

* Add comments

* Respect style guide

---------

Co-authored-by: jamesmckinna <[email protected]>
@MatthewDaggitt MatthewDaggitt added this to the v2.2 milestone Sep 3, 2024
@MatthewDaggitt MatthewDaggitt changed the title Merge v2.1.1 in master Merge v2.1.1 into master Sep 3, 2024
@jamesmckinna
Copy link
Contributor

This brings across all the changes on experimental and v2.1.1-release branches onto master. Therefore after this is merged everyone working on the library will need to update to v2.7.0 of Agda.

Ahead of a proper review, I have been testing recent PRs against both v2.6.4.3 and v2.7.0, so hopefully any eventual merge of this PR will be a painless transition... ;-)

@jamesmckinna jamesmckinna mentioned this pull request Sep 3, 2024
Copy link
Contributor

@jamesmckinna jamesmckinna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks fine, modulo the structure of CHANGELOG and some of the additional textual suggestions, but none is (I think!) a deal-breaker.

My only thought is that we perhaps try to clear the other remaining non-DRAFT open stdlib-v2.2/agda-v2.6.4.3 PRs (or else: as much of the v2.2 milestone as we can agree upon ;-)) before merging this one, in the interests of marking a clean 'break' between Agda versions? Or, at least, that we discuss this among the maintainer core team before proceeding (ie. observe more than the '2 approvals' rule)?

@@ -76,11 +76,11 @@ jobs:
if [[ '${{ github.ref }}' == 'refs/heads/experimental' \
|| '${{ github.base_ref }}' == 'experimental' ]]; then
# Pick Agda version for experimental
echo "AGDA_COMMIT=4d36cb37f8bfb765339b808b13356d760aa6f0ec" >> "${GITHUB_ENV}";
echo "AGDA_COMMIT=18cc53941e924b144c0f1f3953280ef726009f7e" >> "${GITHUB_ENV}";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't verified that these are the correct commit hashes!
(But, for info: how could/should I, were I to want to?)

@jamesmckinna
Copy link
Contributor

Consider also rolling the typo change LICENSE -> LICENCE in doc/release-guide.txt into this PR?

@andreasabel
Copy link
Member

andreasabel commented Sep 6, 2024

@MatthewDaggitt @jamesmckinna Would be great the see this being merged quickly, because:

  • For the upcoming 2.7.0.1 bugfix release of Agda I would like to track the master again rather than experimental.
  • I have a new small commit for experimental concerning Agda 2.8.0. (It is actually so small it can go into master as well: Replace record directive "eta-equality" by "no-eta-equality;pattern" #2476) However, it is probably smarter to not touch experimental why this PR here is pending.

Or maybe I am wrong here and you can advise me a better workflow.

@jamesmckinna
Copy link
Contributor

@andreasabel I'm not trying to get in the way, indeed I'm happy to go ahead and merge, but currently waiting on a second 'approve' review, and feedback from @MatthewDaggitt on my own round of comments. I guess we can take the first one as read from you (but please do so explicitly), and once Matthew comes back, happy to proceed... Hope this helps!

Fix typo
bring the date forward to today
@jamesmckinna
Copy link
Contributor

Two cosmetic patches applied after @andreasabel 's comments, and will merge now.

@jamesmckinna jamesmckinna added this pull request to the merge queue Sep 7, 2024
@jamesmckinna jamesmckinna linked an issue Sep 7, 2024 that may be closed by this pull request
@jamesmckinna jamesmckinna removed a link to an issue Sep 7, 2024
Merged via the queue into master with commit 4144346 Sep 7, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet