Skip to content

DO NOT SQUASH Merge release - #5404

Merged
connorjward merged 10 commits into
mainfrom
connorjward/merge-release
Aug 28, 2026
Merged

DO NOT SQUASH Merge release#5404
connorjward merged 10 commits into
mainfrom
connorjward/merge-release

Conversation

@connorjward

@connorjward connorjward commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

No description provided.

JHopeCollins and others added 8 commits August 25, 2026 15:27
@JHopeCollins
check periodicity from unique mesh in ASMExtrudedStarPC (#5384)
5718c33
@achanbour
Add AC to team website (#5387)
994ce64
@achanbour
Fix docs makefile to automatically regenerate authors list (#5388)
698dd5b 
* fixed makefile so that authors.rst now get generated when changing team.ini
@pbrubeck
update AGENTS.md (#5344)
28176f8
@connorjward
Fix repeated assembly of Real one forms (#5393)
2646ea7
@connorjward
Remove dead link (#5397)
a3ab6a6
@connorjward
Fix macOS for release (#5389)
f090cdd 
* Use supermesh main branch

To get firedrakeproject/libsupermesh#20.

* Fix supermesh linking for static libsupermesh.a

This is likely never going to be an issue in practice because this fixes
Linux for static libraries, and the core fix is only needed for macOS,
where things work as is. However, it can't hurt.
@connorjward
Merge remote-tracking branch 'origin/release' into connorjward/merge-…
7e7ff38 
…release
@connorjward

connorjward commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

@pbrubeck this drops the changes to AGENTS.md that you added in https://github.com/firedrakeproject/firedrake/pull/5215/changes#diff-a54ff182c7e8acf56acfd6e4b9c3ff41e2c41a31c9b211b2deb9df75d9a478f9. I don't know how you want to resolve that. If you could suggest a comment on this PR adding whatever you liked back in that'd be great.

@pbrubeck

pbrubeck commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

@pbrubeck this drops the changes to AGENTS.md that you added in https://github.com/firedrakeproject/firedrake/pull/5215/changes#diff-a54ff182c7e8acf56acfd6e4b9c3ff41e2c41a31c9b211b2deb9df75d9a478f9. I don't know how you want to resolve that. If you could suggest a comment on this PR adding whatever you liked back in that'd be great.

I'll wait until release is merged and fix conflicts in 5215

@connorjward
connorjward force-pushed the connorjward/merge-release branch from 069e3ca to 31b15eb Compare August 28, 2026 11:44
@connorjward
connorjward force-pushed the connorjward/merge-release branch from 31b15eb to 8a4121d Compare August 28, 2026 12:01
@connorjward connorjward added the ci:macos Run the test suite on the Mac runners label Aug 28, 2026
pbrubeck
pbrubeck reviewed Aug 28, 2026
View reviewed changes
Comment thread AGENTS.md
@connorjward
connorjward merged commit f36e30c into main Aug 28, 2026
6 of 7 checks passed
@connorjward
connorjward deleted the connorjward/merge-release branch August 28, 2026 14:44
@connorjward

connorjward commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

@leo-collins just FYI: I have had to reintroduce rtree as a dependency of Firedrake again. You may have noticed the recent missing symbol errors in CI. I tracked it down to a bug in the macOS linker (firedrakeproject/libsupermesh#20) and my workaround is to make libsupermesh into a static library instead of a dynamic one (libsupermesh.a not libsupermesh.dylib).

A side effect of this is that the static library can seemingly no longer find the libspatialindex it was built against (from rtree) and so we have to add it manually. I hope to revert this eventually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pbrubeck pbrubeck pbrubeck left review comments

Assignees

No one assigned

Labels

ci:macos Run the test suite on the Mac runners

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@connorjward @pbrubeck @JHopeCollins @achanbour