Open one auto-merging PR per package from every sync workflow
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.
This commit is contained in:
1 parent
a7f730d1e6
commit
ba7561a34c
11 files changed
+424
-467
No files matched your search
@@ -383,28 +383,28 @@ or an existing test needs a maintainer to merge it.
|
||||
|
||||
## Automatic updates
|
||||
|
||||
Three scheduled workflows open PRs. Each takes a `packages` input for a manual
|
||||
run on named packages; for the two sync workflows that run opens its own PR,
|
||||
on `auto/sync-upstream-<packages>` or `auto/sync-rebuilds-<packages>`.
|
||||
Three scheduled workflows open PRs, one per package, through
|
||||
`package-prs.yml`. Each PR auto-merges when its build is green, so the open
|
||||
ones are the failures. Each workflow takes a `packages` input for a manual run
|
||||
on named packages.
|
||||
|
||||
| Workflow | Runs | Opens | Merges |
|
||||
| Workflow | Runs | Opens one PR per package on | For |
|
||||
|---|---|---|---|
|
||||
| `sync-upstream.yml` | every 6 hours | one PR on `auto/sync-upstream` with every new upstream release | **a maintainer merges it** |
|
||||
| `sync-rebuilds.yml` | every 6 hours | one PR on `auto/sync-rebuilds` bumping `pkgrel` where a `rebuild_on` dependency moved | itself, when green |
|
||||
| `track-branches.yml` | hourly | one PR per package on `auto/track-branches-<package>` updating `"auto_merge": true` packages to their newest upstream release or branch tip; packages pinned from the same branch share one | itself, when green |
|
||||
| `sync-upstream.yml` | every 6 hours | `auto/sync-upstream-<package>` | a new upstream release |
|
||||
| `sync-rebuilds.yml` | every 6 hours | `auto/sync-rebuilds-<package>` | a `pkgrel` bump where a `rebuild_on` dependency moved |
|
||||
| `track-branches.yml` | hourly | `auto/track-branches-<package>` | `"auto_merge": true` packages: the newest upstream release or branch tip |
|
||||
|
||||
- **Each sync PR is a batch.** One package that fails to build keeps the
|
||||
whole PR red and unmerged. Fix that package on `master`. A run with
|
||||
`packages` naming the healthy ones gives them their own PR. The branch
|
||||
tracker opens a PR per package, so a red one holds back only itself; its
|
||||
next run replaces it, and closes it once master holds a newer pin.
|
||||
- **A red PR holds back only its own package.** Fix it on `master` or on the
|
||||
PR. The next run updates the PR if upstream moves again, and closes it once
|
||||
it conflicts with `master`. Packages pinned from the same upstream branch
|
||||
(`omarchy-dev` and `omarchy-settings-dev`) share a PR, because they move in
|
||||
lockstep.
|
||||
- **A package with no upstream declaration or hook gets no upstream updates.** That
|
||||
includes the kernels (`linux-omarchy*`, `linux-ptl`, `linux-aurora`): bump
|
||||
them by PR.
|
||||
- A failed run of any of the three posts to Basecamp when
|
||||
`BASECAMP_CHATBOT_URL` is set.
|
||||
- Every self-merging path (`sync-rebuilds.yml`, `track-branches.yml` and
|
||||
`auto-merge-pr.yml`) needs
|
||||
- Every self-merging path (the three above and `auto-merge-pr.yml`) needs
|
||||
the `PKGS_BOT_TOKEN` secret: a personal access token with Contents and Pull
|
||||
requests write access to this repository, owned by an account trusted to
|
||||
build. A merge made with the built-in `GITHUB_TOKEN` does not start
|
||||
@@ -428,7 +428,7 @@ Details: [docs/upstream-sources.md](docs/upstream-sources.md),
|
||||
| `source` | Always `local`. |
|
||||
| `upstream` | Where releases come from. Mutually exclusive with an `.omarchy/upstream.sh` hook. |
|
||||
| `min_release_age` | Hold a new upstream release back this long (`"24h"`, `"2d"`). A release whose age cannot be proven fails the sync. |
|
||||
| `auto_merge` | `true` moves the package's updates from the reviewed sync PR to `track-branches.yml`. For packages that follow a moving branch, and for trusted vendor and Omacom release feeds. Needs an upstream declaration. |
|
||||
| `auto_merge` | `true` moves the package's updates from `sync-upstream.yml` (every 6 hours) to `track-branches.yml` (hourly). For packages that follow a moving branch, and for feeds worth shipping within the hour. Needs an upstream declaration. |
|
||||
| `release_ring` | `fast`: publish to `rc` and `stable` on merge, not only `edge`. Takes effect with the package's next version: bump `pkgrel` in the same PR. |
|
||||
| `channels` | The only channels the package may be published to. `omarchy-dev` is held to `["edge"]` this way. |
|
||||
| `pinned` | Version is set per release on the `rc` branch. Used by `omarchy` and `omarchy-settings`. |
|
||||
|
||||
Reference in new issue
Block a user