Timothy Wright
cb3909f052
* Automate Grok Bot releases * Refresh Grok Bot to apt 0.66.0 and harden upstream.sh Bump both architectures to Cursor apt 0.66.0 with matching SHA256s, introduce a versioned _pool URL helper, and filter Packages stanzas by Package: grok-bot so sync stays correct if the index grows. * grok-bot: bump to 0.68.1, drop manual hold, validate pool filename Bump both architectures to Cursor apt 0.68.1 with the SHA256s from the amd64/arm64 Packages indexes (verified against the downloaded debs). Drop grok-bot from the manual holds list in docs/upstream-sources.md and have upstream.sh check that the newest stanza's Filename is the versioned pool path the PKGBUILD downloads from. Both additions come from #848.
17 KiB
Direct upstream watches
Omarchy owns the recipes in pkgbuilds/. bin/sync-upstream discovers new
releases directly from project/vendor feeds and updates versions, declared
release variables, and the source checksums already used by the recipe. It never
imports upstream PKGBUILDs or runs downloaded build scripts. Architecture support,
root install hooks, dependencies, and build functions remain ours to maintain.
upstream.watch complements the existing declarative providers and custom hooks:
{
"source": "local",
"upstream": {
"watch": {
"github": "abenz1267/walker",
"pattern": "v(?P<version>[0-9]+(?:\\.[0-9]+)*)"
}
}
}
Watch fields
Choose exactly one provider: github (owner/repository), git_tags (repository
HTTPS URL), git_branch (repository URL plus explicit branch), npm or pypi
(package name), debian (Packages index plus exact package), json (URL plus
version path), regex (text URL), redirect (final HTTPS download URL), or
archive (inspect archive metadata without extracting/executing code).
Tag, text, redirect and archive watches use an explicit pattern with a named
version capture. Tag patterns match the entire tag. version optionally formats
those captures into an Arch pkgver; e.g. Sublime uses 4.{version}. JSON feeds can
expose additional capture values through fields, a name-to-JSON-path map.
variables maps recipe scalars such as _commit or _build to capture templates.
Only explicitly declared underscore-prefixed variables can change. GitHub
{commit} resolves the selected tag, not a moving target_commitish branch.
submodules can map a recipe variable to a gitlink in the selected GitHub tag;
RustDesk uses this for hbb_common. Downloaded repository code is never evaluated.
For upstreams that rebuild a release, declare a numeric revision template and
its revision_variable. With unchanged pkgver, only an increasing revision can
advance that variable, and the downstream pkgrel increments instead of resetting.
Cursor CLI uses sequence to preserve its date/counter/hash version convention
when the vendor publishes a second hash on the same day. A new pkgver resets
pkgrel to 1, but the complete epoch:pkgver-pkgrel must still increase.
GitHub releases exclude drafts and prereleases unless allow_prerelease is true.
Existing min_release_age policies apply: a feed without a verifiable publication
time cannot bypass a configured hold.
Branch watches
A git_branch watch treats every commit on a branch as a release and writes an
immutable pin ("_commit": "{commit}") so the recipe never carries a moving
#branch= source; tests/pinned-sources.sh enforces that. The clone is bare,
blobless and single-branch, read only with git, and shared by every package
that watches the same branch in one run, so two recipes pinned from it always
see the same commit. Values available to version:
{date}(default),{count}(commits on the branch),{commit}({commit:.7}for the short form)- with
tag_pattern(a regular expression with a namedversiongroup, matched against whole tags):{tag},{version}from that tag, and{distance}, the number of commits past it. Only tags in the pinned commit's own history count, so a release cut on another branch is ignored.
{version}.r{distance}.g{commit:.7} gives 1.21.0.r15.gabc1234, which pacman
orders above the 1.21.0 release it follows and below 1.21.1; omasnap-git
uses it. The Omarchy dev pair uses {version}.r{count}.g{commit:.7} instead
because its published history counted every commit and the number must never
go down.
min_release_age holds a branch tip until its commit timestamp is old enough.
A fresh tip leaves the existing pin alone; the watch never walks backward to
an older commit. This uses Git's committer date, not the time a commit was
pushed. BYPASS_MIN_RELEASE_AGE=1 bypasses the hold.
Packages marked "auto_merge": true ride the unattended lane
(track-branches.yml) instead of the reviewed sync PR: their bump PR is opened
and auto-merged as soon as the build checks pass. bin/sync-upstream --lane reviewed|auto-merge|all selects a lane; the scheduled workflows each pass their
own. Packages that pin the same branch move in lockstep: if one of them fails
to update, the run restores the others and reports the group as failed. A
targeted sync includes the other packages watching that branch, so requesting
only omarchy-dev also updates omarchy-settings-dev.
Enable unattended branch updates
The schedule already runs in GitHub Actions; no server cron job is needed. It uses a personal access token so its PRs trigger builds and its merges trigger publishing without manual approval. No GitHub App is required.
- Use a fine-grained PAT with access to omacom/omarchy-pkgs and repository Contents: Read and write and Pull requests: Read and write permissions. Its owner must be trusted by the build workflow (for example, a collaborator). The existing controller PAT can be reused when it has these permissions.
- In the repository's
Actions secrets,
save the PAT as
PKGS_BOT_TOKEN. Update this secret when the token is rotated or expires. The built-in ActionsGITHUB_TOKENcannot run this unattended chain. - Keep Allow auto-merge enabled and require
result,self-tests, andbuild-isolationonmaster; the tracker does not request a protection bypass. - After merging the tracker, run Track upstream branches once from Actions to verify that its PR builds, auto-merges, and starts Publish merged packages. Subsequent runs happen every two hours.
Checksums retain their algorithms (SHA256, SHA512, BLAKE2, etc.) and source order.
Changed git sources are hashed with makepkg's git-archive convention. Unchanged
sources retain their hashes; mutable_sources explicitly names entries such as
source:0 that must be fetched again for a new version despite a stable URL.
Existing SKIP entries remain unchanged (including signed metadata verified by
the recipe); new skips are never introduced. Changed URLs are still fetched.
A matching GitHub release asset SHA256 digest avoids downloading large assets.
Missing architecture artifacts or malformed metadata fail the package atomically.
Every declared architecture must read back the same release and checksum values.
Archive watches use member to select a text member, or filenames: true to read
versions from archive member names. Debian archives are read through their control
metadata. unescape_json handles JSON strings embedded in a vendor's HTML page.
Maintenance and validation
Running watches locally requires Python 3.11+, Bash, curl, git, jq, Arch's
vercmp, and bsdtar. CI installs these in its Arch container.
- Edit packaging and architecture changes directly in PKGBUILD. The old AUR overlays have been folded into these recipes and removed.
- Keep source-code patches and install hooks checked in as ordinary package files.
- Bump pkgrel when changing a recipe at the same version. Removing a dotted AUR suffix must never lower the complete version.
- Add a watch with each new package.
bin/add-package --source auris a one-time import; it records historicaloriginmetadata and leaves an owned recipe. python helpers/upstream-watch.py check pkgbuilds/NAMEchecks release discovery without rewriting the recipe.bin/sync-upstream NAMEperforms the update.python tests/upstream-watch.pytests update atomicity, architecture coverage, version ordering, source hashes and hostile metadata using offline fixtures.
The scheduled workflow continues reviewing completed updates if another package fails. The failing recipe stays unchanged and the run still reports failure.
Migrated package watches
68 active AUR packages now use direct watches. The nine previously disabled
packages retain manual maintenance holds. Historical AUR provenance is recorded
in origin and has no effect on release selection.
Existing manual holds
libfprint-git, libretro-cap32-git, libretro-database-git, libretro-fbneo-git, libretro-uae-git, libretro-vice-git, quickshell-git, supergfxctl.
These packages were already excluded from automatic AUR updates. The migration preserves that policy.
m1n1-aurora and uboot-asahi are deliberate holds: Apple Silicon boot code, pinned by hand like linux-aurora, and bumped only after a cold boot on the qualification Macs. m1n1-aurora pins an aurora-silicon/m1n1 commit plus a local patch. uboot-asahi follows asahi-alarm's recipe and patch set (asahi-alarm/PKGBUILDs), which a tag watch on AsahiLinux/u-boot cannot carry.
cua-driver-bin is a deliberate hold: Omarchy bumps it by hand, so a Cua release ships only when a maintainer has verified it. It keeps its .omarchy/upstream.sh hook and min_release_age, so lifting the hold means removing "sync": false. cua-hyprland-plugin declares no upstream source, so no automation updates it either.
Package-specific boundaries
- NVIDIA watches remain on the 580 driver branch.
- Hardware-specific packages keep their declared architectures; this migration does not invent ARM binaries for x86-only upstreams.
- iA Duospace was deleted upstream. Its four legacy font files retain their original immutable pin while the other families track the current repository.
- RustDesk reads hbb_common from the release gitlink; its existing build-time dependency/toolchain checks remain in force.
- Spotify uses HTTPS and retains its signed Release/Packages verification.
- Source and build compatibility still need review when upstream code changes. Direct watches remove AUR recipe churn, not the need to maintain packaging.