Skip to content

Merge develop into release/MAPL-v3 (record ancestry after #505) - #507

Merged
pchakraborty merged 7 commits into
release/MAPL-v3from
merge/pchakrab/develop-into-mapl3-2026Nov16
Nov 16, 2026
Merged

pchakraborty merged 7 commits into
release/MAPL-v3from
merge/pchakrab/develop-into-mapl3-2026Nov16

Conversation

@pchakraborty

Copy link
Copy Markdown
Collaborator

#505 was squash-merged, so git still treats develop (#496 0d19ada and later) as unmerged. This PR is a -s ours merge with develop (f638638) as its second parent. It also brings over the two pieces of #496 that #505 didn't: a workflow_dispatch trigger and the spack refs note in workflow.yml, plus a CHANGELOG line for them.

Kept as on release/MAPL-v3 on purpose: components.yaml (MAPL3 pins and branches), the CI fixture settings (fixture-ref: release/MAPL-v3, run-mepo-develop: false), and the agent docs that #503 replaced.

Please merge with "Create a merge commit", not squash, or the ancestry is lost again.

Verification: the diff against release/MAPL-v3 touches only workflow.yml (+4 lines) and CHANGELOG.md (+1 line). git rev-list HEAD..origin/develop lists 0 commits. The YAML parses. No Fortran changes, so nothing was built.

mathomp4 and others added 7 commits October 20, 2026 12:39
Documentation only. Claims cite source files; readings are marked Inferred, unchecked statements Unverified. Observed oddities are noted, not fixed.

Plan-Task: I-ArchDocs
Documentation only: build sections state how the repository is built, not compiler choices.

Plan-Task: I-ArchDocs
Links to files outside this repository are dead on GitHub; they are now
code paths relative to the fixture checkout.

Plan-Task: I-ArchDocs
…re-docs

Add agent-oriented architecture documentation
Ours-merge of develop (9fd3b73) to record ancestry lost by the #505 squash; brings over the workflow_dispatch trigger and spack refs note from #496.
@pchakraborty pchakraborty added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Nov 16, 2026
@pchakraborty
pchakraborty marked this pull request as ready for review November 16, 2026 12:46
@pchakraborty
pchakraborty requested a review from a team as a code owner November 16, 2026 12:46
@pchakraborty
pchakraborty merged commit dd5eaf1 into release/MAPL-v3 Nov 16, 2026
18 checks passed
@pchakraborty
pchakraborty deleted the merge/pchakrab/develop-into-mapl3-2026Nov16 branch November 16, 2026 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants