Skip to content

Track upstream branches: omarchy-dev 4.0.0.r6807.g902fd8a, omarchy-settings-dev 4.0.0.r6807.g902fd8a - #788

Merged
ryanrhughes merged 1 commit into
masterfrom
auto/track-branches
Oct 8, 2026
Merged

ryanrhughes merged 1 commit into
masterfrom
auto/track-branches

Conversation

@ryanrhughes

Copy link
Copy Markdown
Collaborator

Automated pin of packages that follow a moving upstream branch
("auto_merge": true in .omarchy/package.json). Each package's
_commit now points at the branch tip. Fresh tips wait until
their commit timestamp is at least min_release_age old.

This PR auto-merges once the build checks pass. A failing build
leaves it open; the next tracker run replaces it with the newer tip.

@ryanrhughes
ryanrhughes enabled auto-merge October 4, 2026 01:54
@ryanrhughes
ryanrhughes force-pushed the auto/track-branches branch 2 times, most recently from 8c2b792 to d8afc3c Compare October 4, 2026 15:28
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6726.g5c4da02, omarchy-settings-dev 4.0.0.r6726.g5c4da02, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6768.g6520ac7, omarchy-settings-dev 4.0.0.r6768.g6520ac7, omasnap-git 1.21.0.r81.g6771b19 Oct 4, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6768.g6520ac7, omarchy-settings-dev 4.0.0.r6768.g6520ac7, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6774.g035ce29, omarchy-settings-dev 4.0.0.r6774.g035ce29, omasnap-git 1.21.0.r81.g6771b19 Oct 4, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6774.g035ce29, omarchy-settings-dev 4.0.0.r6774.g035ce29, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6775.g2f7302a, omarchy-settings-dev 4.0.0.r6775.g2f7302a, omasnap-git 1.21.0.r81.g6771b19 Oct 4, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6775.g2f7302a, omarchy-settings-dev 4.0.0.r6775.g2f7302a, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6777.g65c0f33, omarchy-settings-dev 4.0.0.r6777.g65c0f33, omasnap-git 1.21.0.r81.g6771b19 Oct 5, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6777.g65c0f33, omarchy-settings-dev 4.0.0.r6777.g65c0f33, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6784.g81145eb, omarchy-settings-dev 4.0.0.r6784.g81145eb, omasnap-git 1.21.0.r81.g6771b19 Oct 5, 2026
@ryanrhughes
ryanrhughes force-pushed the auto/track-branches branch 6 times, most recently from 2c91e49 to d34248c Compare October 7, 2026 09:06
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6784.g81145eb, omarchy-settings-dev 4.0.0.r6784.g81145eb, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6796.g0f8af9b, omarchy-settings-dev 4.0.0.r6796.g0f8af9b, omasnap-git 1.21.0.r81.g6771b19 Oct 7, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6796.g0f8af9b, omarchy-settings-dev 4.0.0.r6796.g0f8af9b, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6803.gd9b970d, omarchy-settings-dev 4.0.0.r6803.gd9b970d, omasnap-git 1.21.0.r81.g6771b19 Oct 7, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6803.gd9b970d, omarchy-settings-dev 4.0.0.r6803.gd9b970d, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6807.g902fd8a, omarchy-settings-dev 4.0.0.r6807.g902fd8a, omasnap-git 1.21.0.r81.g6771b19 Oct 7, 2026
@ryanrhughes ryanrhughes changed the title Track upstream branches: omarchy-dev 4.0.0.r6807.g902fd8a, omarchy-settings-dev 4.0.0.r6807.g902fd8a, omasnap-git 1.21.0.r81.g6771b19 Track upstream branches: omarchy-dev 4.0.0.r6807.g902fd8a, omarchy-settings-dev 4.0.0.r6807.g902fd8a Oct 8, 2026
@ryanrhughes
ryanrhughes merged commit f004f5f into master Oct 8, 2026
6 checks passed
@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

Publish succeeded → live

Packages: omarchy-dev (x86_64, PR artifact); omarchy-dev (aarch64, PR artifact); omarchy-settings-dev (x86_64, PR artifact); omarchy-settings-dev (aarch64, PR artifact)

  • edge/x86_64: omarchy-dev-4.0.0.r6807.g902fd8a-1-x86_64, omarchy-settings-dev-4.0.0.r6807.g902fd8a-1-x86_64
  • edge/aarch64: omarchy-dev-4.0.0.r6807.g902fd8a-1-aarch64, omarchy-settings-dev-4.0.0.r6807.g902fd8a-1-aarch64

Some planned slots did not run because an earlier slot failed.

Commit f004f5f · run

ryanrhughes added a commit that referenced this pull request Oct 9, 2026
sync-upstream.yml, sync-rebuilds.yml and track-branches.yml each opened one
batch PR, so one package with a failing build held back every other update
in it (#788, #837). All three now group their changes with
package-pr-groups.sh and hand them to package-prs.yml, which opens a PR per
package and arms auto-merge. Packages pinned from the same upstream branch
still share one. Green packages land on their own and only the failures stay
open; a red PR conflicting with master, and each lane's old batch PR, get
closed.

sync-upstream.yml loses its human-merged lane: it now pushes with the PAT
like the other two, so its builds start without an approval hold and its PRs
auto-merge when green. min_release_age still quarantines fresh releases. Its
approve job, approve-sync-push.cjs, and auto-merge-pr.cjs's exception for
auto/sync-upstream go with it.
gentlemanSoup pushed a commit to gentlemanSoup/omarchy-pkgs that referenced this pull request Oct 10, 2026
… back

The branch tracker stalled omarchy-dev and omarchy-settings-dev twice in a
week:

- All ~50 auto_merge packages rode one PR, so omasnap-git's failing smoke
  suite kept the quattro pins unmerged from Oct 4 to Oct 8 (omacom#788). Each
  package now gets its own PR on auto/track-branches-<package>; packages
  pinned from the same branch share one, since they move in lockstep. A run
  closes tracker PRs that master has moved past, and the old single PR.
- A branch tip younger than min_release_age held the whole branch, so a
  run that landed shortly after a quattro commit pinned nothing. The watch
  now falls back along first-parent history to the newest commit that has
  cleared the window, measured from clone time so siblings agree.
- The every-2-hours schedule fired every 6 to 9 hours in practice; run it
  hourly.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant