Rewrite the README around the pipeline as it runs today
The README described the repository host as the publisher: bin/repo release as the main workflow, five-minute systemd timers, a signing key that lives on the host and nowhere else, aarch64 under emulation. Since September 18 packages are built by build-pr.yml and published by publish.yml, and neither workflow was mentioned. ci/README.md still opened with "Status: spike. Nothing here publishes." The README now covers, in order: contributing a package, how a package reaches users, where it is published, the maintainer tasks (republish, build, retire, check that a version is live, read the publish log), what to do when a publish fails, who can build and merge, the three scheduled update workflows, package metadata, releases, and the rules that keep two publishers from colliding. Text about the old host pipeline moved to docs/repository-host.md, marked abandoned. The rest moved to docs/ largely unchanged: - docs/releases.md: the release train and versioning rules - docs/rebuild-triggers.md: rebuild_on and bin/sync-rebuilds - docs/builds.md: dependency order, isolation, builder images - docs/upstream-sources.md: gains the provider and hook reference ci/README.md is rewritten as the operating guide for the x86_64 builder pool. Statements the move would have carried over wrong are corrected, among them the signing key's location, AUR sync, and which architecture list CI reads. bin/sync-upstream's help now points at the docs page that holds the provider schemas.
This commit is contained in:
1 parent
5abe08fbab
commit
9b7daaf564
8 files changed
+1558
-1126
No files matched your search
+1
-1
@@ -23,7 +23,7 @@ Update packages that track an upstream vendor release feed instead of the AUR.
|
||||
Packages opt in declaratively through "upstream" in .omarchy/package.json.
|
||||
Providers cover GitHub Releases with checksum manifests or API asset digests,
|
||||
semver-shaped git tags, npm dist-tags, and plain Debian Packages indexes. See
|
||||
README.md for the schemas. Anything outside those conventions may provide
|
||||
docs/upstream-sources.md for the schemas. Anything outside those conventions may provide
|
||||
pkgbuilds/<package>/.omarchy/upstream.sh, a hook that reports JSON on stdout:
|
||||
|
||||
{
|
||||
|
||||
+100
-80
@@ -1,96 +1,116 @@
|
||||
# CI spike: build PRs on ephemeral DigitalOcean droplets
|
||||
# The x86_64 builder pool
|
||||
|
||||
Status: spike. Nothing here publishes. The repository host keeps building and
|
||||
signing on merge exactly as before.
|
||||
x86_64 package builds run on DigitalOcean droplets that exist for one job
|
||||
each. aarch64 builds run on GitHub's `ubuntu-24.04-arm` runners and need
|
||||
nothing here.
|
||||
|
||||
## Pieces
|
||||
## How it works
|
||||
|
||||
- `.github/workflows/build-pr.yml` — on a PR touching `pkgbuilds/**`, one job
|
||||
per changed package on runners labelled `omarchy-builder`. aarch64 jobs
|
||||
run on GitHub's native `ubuntu-24.04-arm` runners instead. Uploads the unsigned
|
||||
`.pkg.tar.zst` as a workflow artifact (7 days).
|
||||
- `runner-cloud-init.yaml` — Ubuntu 24.04 user-data: docker + buildx, the
|
||||
GitHub runner registered `--ephemeral`, runs one job, powers off.
|
||||
- `controller.sh` — systemd timer every minute on a small always-on droplet.
|
||||
Polls for queued jobs with our label, creates one g5-32vcpu-64gb-50gb droplet per job up
|
||||
to `MAX_DROPLETS`, deletes droplets that are powered off or older than
|
||||
`MAX_AGE_MINUTES`, or still provisioning after `MAX_BOOT_MINUTES`. Builders go in any region DigitalOcean lists the size in
|
||||
stock in (`REGIONS` only sets which to try first); a refused create, logged
|
||||
with DigitalOcean's message, falls back to the next region, then the next
|
||||
of `SIZES`. No inbound endpoint. Plain curl against both APIs, no
|
||||
doctl and no gh: a token in the environment cannot pick the wrong account
|
||||
the way a saved doctl context can. Needs curl and jq.
|
||||
`tests/controller.sh` exercises every decision against canned responses.
|
||||
- `controller-box/` — the always-on droplet: unit, timer, env template,
|
||||
cloud-init, and `create.sh` to stand it up with one API call.
|
||||
- **Jobs ask for a runner labelled `omarchy-builder`.** `build-pr.yml` builds
|
||||
x86_64 packages there, and so does the `rebuild` job in `publish.yml`.
|
||||
- **A controller creates one droplet per queued job.** `controller.sh` runs
|
||||
from a systemd timer every minute on a small always-on droplet (tag
|
||||
`omarchy-controller`). It polls GitHub for queued jobs with the label and
|
||||
creates droplets up to `MAX_DROPLETS`. It has no inbound endpoint.
|
||||
- **A droplet runs one job and powers off.** `runner-cloud-init.yaml` installs
|
||||
Docker and the GitHub runner, registers it `--ephemeral` with a
|
||||
registration token that expires in an hour, runs the job, and powers off, also when the runner download or
|
||||
registration fails. The controller removes any other failed droplet at
|
||||
`MAX_AGE_MINUTES`.
|
||||
- **The controller deletes droplets** that are powered off, older than
|
||||
`MAX_AGE_MINUTES`, or still provisioning after `MAX_BOOT_MINUTES`, and
|
||||
replaces a stuck one in the same tick.
|
||||
- **Sizes and regions fall back.** Each tick tries every size in `SIZES`, in
|
||||
every region DigitalOcean lists it in stock. `REGIONS` only sets which
|
||||
regions go first. A refused create is logged with DigitalOcean's message.
|
||||
|
||||
## Standing up the controller box
|
||||
No secret reaches a builder. Signing and upload happen in the `publish` job on
|
||||
a GitHub-hosted runner.
|
||||
|
||||
DIGITALOCEAN_TOKEN=<omarchy account> GITHUB_TOKEN=<fine-grained PAT> \
|
||||
REPO=omacom/omarchy-pkgs ci/controller-box/create.sh <branch>
|
||||
## Operate it
|
||||
|
||||
The GitHub PAT is fine-grained, scoped to the one repo: Actions read,
|
||||
Administration read+write (registration tokens). The DO token is baked into
|
||||
the box's env file, so it is the account that pays for builder droplets.
|
||||
Watch it with `journalctl -u omarchy-controller -f` on the box.
|
||||
SSH to the controller droplet as root. It is the droplet tagged
|
||||
`omarchy-controller` in the DigitalOcean account that pays for the builders;
|
||||
the operators' keys were installed when it was created.
|
||||
|
||||
Each tick pulls the box's checkout first, so a merged `controller.sh` is live
|
||||
within a minute. The unit and timer are copies made at creation; after
|
||||
changing them, on the box:
|
||||
```bash
|
||||
journalctl -u omarchy-controller -n 50 --no-pager # What it is doing
|
||||
journalctl -u omarchy-controller -f # Follow it
|
||||
systemctl list-timers omarchy-controller.timer # Is it ticking
|
||||
```
|
||||
|
||||
cp /opt/omarchy-pkgs/ci/controller-box/omarchy-controller.{service,timer} /etc/systemd/system/
|
||||
systemctl daemon-reload
|
||||
| Log line | Meaning |
|
||||
|---|---|
|
||||
| `creating <name> (<size> in <region>)` | A queued job is getting a droplet |
|
||||
| `<size> in <region> refused: <message>` | DigitalOcean refused; the next region or size is tried |
|
||||
| `no size in '<sizes>' can be created in any region` | Every create was refused. Read the `refused:` lines above it for why: out of stock (add a size to `SIZES`), or the account's droplet limit |
|
||||
| `at cap (<live>/<max>, <busy> busy) with <queued> queued` | `MAX_DROPLETS` is reached. Raise it if the queue is long |
|
||||
| `deleting droplet <id> (status=<status> age=<n>m)` | Reaping a finished, old or stuck droplet |
|
||||
|
||||
## What the spike proved (2026-09-17, fork ryanrhughes/omarchy-pkgs)
|
||||
Check the pool from anywhere:
|
||||
|
||||
- `bin/build` works from a bare clone: with no local published tree it
|
||||
plans against and resolves from `https://pkgs.omarchy.org/<mirror>/<arch>`.
|
||||
- Droplet create → runner registered: ~70 s. omarchy-fish PR job: 2 min
|
||||
including the builder image build. Droplet powers off after the job.
|
||||
- linux-omarchy on a c-32 droplet: 30 min wall clock for the build job
|
||||
(23:39 → 00:09), 254 MB artifact. Cold start ~90 s before the job began.
|
||||
- A PR whose PKGBUILD fails to build turns the required check red and GitHub
|
||||
refuses the merge (`mergeStateStatus=BLOCKED`, `gh pr merge` refuses
|
||||
without `--admin`).
|
||||
- Controller: one queued job + one busy droplet ⇒ creates exactly one more;
|
||||
reaps powered-off droplets on the next tick.
|
||||
```bash
|
||||
gh api repos/omacom/omarchy-pkgs/actions/runners --jq \
|
||||
'"online \([.runners[]|select(.status=="online")]|length), busy \([.runners[]|select(.busy)]|length)"'
|
||||
```
|
||||
|
||||
## Not done (required before this touches the real repo)
|
||||
Jobs queued with no runner online for several minutes means the controller is
|
||||
not creating droplets: read its journal. See what is waiting:
|
||||
|
||||
- Tooling from base: check out master's `bin/ helpers/ build/` and overlay
|
||||
only the PR's `pkgbuilds/<name>`; today a PR can edit the build script
|
||||
and it runs on the droplet. The vouch gate limits who can do that, not
|
||||
what they can do.
|
||||
- DigitalOcean cloud firewall on the `omarchy-builder` tag: no inbound, no
|
||||
egress to private ranges or the metadata address.
|
||||
- A fine-grained GitHub token for the real repository (the one on the
|
||||
controller box is scoped to the fork), and the publish environment's
|
||||
secrets set there.
|
||||
- Disable the host's auto-release timers for any channel CI publishes to,
|
||||
so two writers never touch one database.
|
||||
```bash
|
||||
gh run list -R omacom/omarchy-pkgs --workflow build-pr.yml --status queued
|
||||
```
|
||||
|
||||
## Done since the spike README was first written
|
||||
Only x86_64 jobs use this pool. A queued aarch64 job is waiting on GitHub's
|
||||
own runners.
|
||||
|
||||
- Controller as a systemd timer on its own droplet, plain curl, self-test.
|
||||
- Build once against edge; one artifact per package per architecture,
|
||||
published into every channel it belongs to (fast ring: all three at
|
||||
once). arch=any builds once for every architecture database.
|
||||
- Publish is incremental and immutable: pull the channel db, refuse
|
||||
different bytes under an existing name, accept identical bytes, upload
|
||||
packages then signatures then the db.
|
||||
- aarch64 under QEMU with credential-preserving binfmt. PR builds now run
|
||||
aarch64 natively on `ubuntu-24.04-arm` (QEMU was up to ~15x slower). When a
|
||||
merged tree has no artifact, publish.yml rebuilds it in its own job, aarch64
|
||||
there and x86_64 on a droplet, outside the publish lock.
|
||||
- Publish itself builds nothing: it signs and uploads on `ubuntu-latest` in the
|
||||
tested builder image pulled from GHCR, and only that job holds the `publish`
|
||||
concurrency group, so a merge waits for seconds of signing, not for builds.
|
||||
- Vouch gate: collaborators, `.github/VOUCHED.td`, or the `build-approved`
|
||||
label; denounced authors cannot be overridden by the label.
|
||||
- Tests run on PRs only; `result`, `self-tests`, `build-isolation` are the
|
||||
required checks with strict up-to-date branches.
|
||||
### Change settings
|
||||
|
||||
## Cleanup
|
||||
Edit `/etc/omarchy-controller.env` on the box. The next tick reads it.
|
||||
|
||||
doctl compute droplet list --tag-name omarchy-builder
|
||||
doctl compute droplet delete -f <id>
|
||||
| Setting | Default in `controller-box/controller.env.example` | |
|
||||
|---|---|---|
|
||||
| `MAX_DROPLETS` | 6 | Builders alive at once. The DigitalOcean account's droplet limit also applies |
|
||||
| `SIZES` | `g5-32vcpu-64gb-50gb g5-32vcpu-128gb-50gb` | Tried in order |
|
||||
| `REGIONS` | empty | Regions to try first; empty means any |
|
||||
| `MAX_AGE_MINUTES` | 200 | Delete a droplet older than this |
|
||||
| `MAX_BOOT_MINUTES` | 10 | Delete a droplet still provisioning after this |
|
||||
|
||||
### Change the controller
|
||||
|
||||
Merge the change to `master`. The unit pulls `/opt/omarchy-pkgs` before every
|
||||
tick, so it is live within a minute. The unit and timer files are copies made
|
||||
when the box was created; after changing them, on the box:
|
||||
|
||||
```bash
|
||||
cp /opt/omarchy-pkgs/ci/controller-box/omarchy-controller.{service,timer} /etc/systemd/system/
|
||||
systemctl daemon-reload
|
||||
```
|
||||
|
||||
`tests/controller.sh` exercises every controller decision against canned API
|
||||
responses. Run it before merging a change.
|
||||
|
||||
### Reach a builder
|
||||
|
||||
Operators can SSH to a builder as root while it lives. It powers off after its
|
||||
one job.
|
||||
|
||||
### Clean up by hand
|
||||
|
||||
The controller reaps on its own. To do it manually, delete droplets tagged
|
||||
`omarchy-builder` in the DigitalOcean account.
|
||||
|
||||
## Stand up a controller
|
||||
|
||||
```bash
|
||||
DIGITALOCEAN_TOKEN=<account that pays for builders> GITHUB_TOKEN=<fine-grained PAT> \
|
||||
REPO=omacom/omarchy-pkgs ci/controller-box/create.sh
|
||||
```
|
||||
|
||||
- The GitHub PAT is fine-grained and scoped to this repository: Actions read,
|
||||
Administration read and write (for runner registration tokens).
|
||||
- The DigitalOcean token is written into the box's env file, so it is the
|
||||
account that pays.
|
||||
- `ADMIN_GITHUB_USERS` names whose GitHub SSH keys get root on the box and
|
||||
the builders. Set it; the default is a fixed list in `create.sh`.
|
||||
- The script refuses to create a second controller.
|
||||
@@ -0,0 +1,80 @@
|
||||
# How a package builds
|
||||
|
||||
`bin/build` is the one builder: PR builds, rebuilds at merge and local builds
|
||||
all call it.
|
||||
|
||||
## Dependency resolution
|
||||
|
||||
Within one `bin/build` run, the build system handles dependencies between the
|
||||
packages it was asked to build. CI builds each package in its own job, so a
|
||||
PR's packages do not see each other's fresh builds; they resolve from `edge`.
|
||||
|
||||
1. Plans dependency order once, including `depends`, `makedepends`,
|
||||
`checkdepends`, and their architecture-specific arrays.
|
||||
2. Builds each package in a fresh container. Installed packages and changes
|
||||
to the container's system files cannot carry over to the next build.
|
||||
3. Shares successful artifacts through the temporary `[omarchy-build]` repo,
|
||||
installing newly built prerequisites in each consumer's container.
|
||||
4. Blocks consumers of a failed prerequisite while continuing independent
|
||||
builds.
|
||||
|
||||
Example: If `aether` depends on `hyprshade`, `hyprshade` is built first.
|
||||
|
||||
Isolation also lets the release and dev Omarchy pairs build in the same run:
|
||||
Flea can install `omarchy` without preventing `omarchy-dev` from installing
|
||||
its conflicting settings package in a different container.
|
||||
|
||||
Pacman downloads are cached under `cache/pacman/<channel>/<arch>/` across
|
||||
containers and runs. The installed package database is never shared. Each
|
||||
container updates its base system before resolving build dependencies, so a
|
||||
cached builder image cannot cause a partial system upgrade. The existing
|
||||
`OMARCHY_KEEP_BUILD_WORKSPACE`, `OMARCHY_SKIP_BUILDER_IMAGE`, and
|
||||
`OMARCHY_DEFER_RUNTIME_DEPS` flags retain their behavior.
|
||||
|
||||
`tests/build-isolation.sh` exercises conflicting package pairs, failed
|
||||
prerequisites, resumed builds, cache replacement, and deferred dependencies
|
||||
using real containers and pacman transactions. It uses the prepared builder
|
||||
image, or an image named by `TEST_BUILDER_IMAGE`; CI builds the small fixture
|
||||
image in `tests/build-isolation.Dockerfile`.
|
||||
|
||||
## Daily builder images
|
||||
|
||||
`Refresh builder images` builds fresh `edge` environments daily at 04:23 UTC,
|
||||
when their inputs change on `master`, and on manual dispatch. x86_64 and
|
||||
aarch64 build on native GitHub-hosted runners, without occupying the DO
|
||||
package-builder pool. Each candidate must pass `tests/build-isolation.sh`,
|
||||
including real package builds, before publication to
|
||||
`ghcr.io/omacom/omarchy-pkg-builder`. Only `master` in this repository can
|
||||
publish; PR workflows cannot replace the shared images.
|
||||
PRs that change image inputs also build and test both candidates on native
|
||||
runners, with a read-only token and no registry publication.
|
||||
|
||||
The compatibility tag contains the architecture, mirror, and a hash of the
|
||||
entire `build/` context, including executable bits and symlink targets but
|
||||
excluding checkout timestamps and ownership. This deliberately invalidates
|
||||
images when mounted build scripts change too. `v1` identifies the image build
|
||||
contract; change it if the invocation or compatibility rules change. Each
|
||||
successful refresh also gets a run-specific tag for diagnosis and rollback.
|
||||
A failed build, isolation test, or push leaves the previous compatible image
|
||||
selected. Scheduled builds use `--pull --no-cache` so unchanged Dockerfiles
|
||||
still pick up fresh Arch packages.
|
||||
|
||||
To build and test a candidate locally:
|
||||
|
||||
```bash
|
||||
bin/builder-image key --arch x86_64 --mirror edge
|
||||
bin/builder-image build --arch x86_64 --mirror edge --tag builder-candidate:test --fresh
|
||||
CONTAINER_ENGINE=docker TEST_BUILDER_IMAGE=builder-candidate:test tests/build-isolation.sh
|
||||
```
|
||||
|
||||
The workflow uses its repository `GITHUB_TOKEN` with `packages: write`; no
|
||||
registry PAT is needed. **One-time setup when the image package is first
|
||||
created:** GHCR
|
||||
creates the package private. In the `omacom/omarchy-pkg-builder` package
|
||||
settings, change visibility to **Public**, then rerun the failed refresh job.
|
||||
The workflow checks anonymous registry access before advancing the compatible
|
||||
tag, so fork PRs will not be directed to an image they cannot pull. Subsequent
|
||||
refreshes preserve that package visibility.
|
||||
|
||||
`publish.yml` and `unpublish.yml` pull the compatible image to sign and update
|
||||
databases. Package build jobs still build their own image on the runner.
|
||||
@@ -0,0 +1,43 @@
|
||||
# Rebuild triggers
|
||||
|
||||
```bash
|
||||
bin/sync-rebuilds # Bump every package whose dependencies moved
|
||||
bin/sync-rebuilds quickshell-git # Update specific packages
|
||||
bin/sync-rebuilds --self-test # Run the regression tests
|
||||
```
|
||||
|
||||
Some packages have to be rebuilt when something they link against changes, even though nothing in their own source moved. A Qt private-API consumer is the usual case: `Qt_6_PRIVATE_API` symbols are not covered by the soname, so a qt6-base point release can leave an installed binary unable to resolve a symbol at startup, and pacman upgrades Qt out from under it because the dependency is unversioned. The package still builds from the same git commit, so its version alone would not trigger a rebuild.
|
||||
|
||||
A package names those dependencies in `.omarchy/package.json`:
|
||||
|
||||
```json
|
||||
{ "source": "local", "rebuild_on": ["qt6-base", "qt6-declarative", "qt6-wayland"] }
|
||||
```
|
||||
|
||||
`bin/sync-rebuilds` reads each named package's version from the official
|
||||
repositories for every architecture a merge builds (`CI_ARCHES` in
|
||||
`helpers/paths.sh`, both by default) that the package supports and compares
|
||||
it to `rebuilt_against`. Records are kept per architecture because Arch and
|
||||
Arch Linux ARM can carry different dependency versions. pkgrel is bumped once
|
||||
when any recorded version moves; that one source revision is then built for
|
||||
each architecture by the PR that carries the bump.
|
||||
|
||||
The bump is the point of the command, and it has to land in git rather than in the builder. A rebuild that reuses the published version string produces a package pacman will never offer anyone, so rebuilding without a version change would ship nothing. Bumping pkgrel needs no other change: the PR that carries the bump builds the package, and the merge publishes it.
|
||||
|
||||
The bumped version is checked against the published one as well as the checked-in one, and refused when pacman would not order it higher. The checked-in version is not the floor; what a user already has is, and a checkout that has fallen behind the repository can otherwise be bumped to something that loses to the package it means to replace. That check is skipped with a warning when the published database cannot be read.
|
||||
|
||||
x86_64 versions are read from the local pacman database, so the workflow runs
|
||||
in an Arch container pointed at `mirror.omarchy.org`, the same mirror as the
|
||||
x86_64 builder. aarch64 versions are read directly from the live Arch Linux ARM
|
||||
repository database, which is also what the ARM builder uses. Testing and
|
||||
staging repositories do not count. A legacy flat `rebuilt_against` record is
|
||||
read as x86_64 and is migrated naturally the next time a rebuild is needed.
|
||||
|
||||
A dependency this repository carries for an architecture (a recipe here that builds for edge on it, such as aquamarine on aarch64) shadows the distribution's, because the builder lists `[omarchy]` first. Its version is the recipe's, and it counts only once edge publishes that version: until then the builder still links against the previous one, so dependents are left alone for that run.
|
||||
|
||||
## The workflow
|
||||
|
||||
`sync-rebuilds.yml` runs `bin/sync-rebuilds` every 6 hours, opens one PR on
|
||||
`auto/sync-rebuilds` and enables auto-merge. The PR lands once `result`,
|
||||
`self-tests` and `build-isolation` pass, and the merge publishes. A rebuild that
|
||||
fails stays an open red PR for a maintainer.
|
||||
@@ -0,0 +1,119 @@
|
||||
# Cutting an Omarchy release
|
||||
|
||||
The release train runs from `bin/omarchy-release`. Nothing in the GitHub
|
||||
workflows promotes a channel: its channel moves and RC builds were written to
|
||||
execute on the old repository host, which is abandoned (see
|
||||
[repository-host.md](repository-host.md)), against a local copy of the
|
||||
published tree.
|
||||
|
||||
> `rc` and `ship` build the release pair with `bin/repo release` and move
|
||||
> channels with `bin/repo advance`, on the machine that holds the published
|
||||
> tree. No workflow replaces them yet. That machine's tree has to match the
|
||||
> bucket first: `advance` reads the source channel from local disk.
|
||||
|
||||
`bin/omarchy-release` is the front door. A release train has three human
|
||||
moments, each one command — and bare `omarchy-release` observes reality
|
||||
(branches, pins, published channels, tags) and walks you to the next one:
|
||||
|
||||
```bash
|
||||
bin/omarchy-release # shepherd: status + guided next step
|
||||
bin/omarchy-release start 4.0.2 # open the train: branch v4-0-2 + staging PR
|
||||
bin/omarchy-release pick # choose merged PRs to cherry-pick (multi-select)
|
||||
bin/omarchy-release rc # publish the next 4.0.2rcN to the rc channel
|
||||
bin/omarchy-release ship # tag, final pins, promote rc → stable,
|
||||
# draft GitHub release, ISO, website — one swoop
|
||||
bin/omarchy-release doctor # verify credentials/connections up front
|
||||
```
|
||||
|
||||
Versions are inferred from branch names (`v4-0-2` ⇒ `4.0.2rcN` ⇒ tag
|
||||
`v4.0.2`); `start` is the only place a version is typed. Every command is
|
||||
idempotent — re-runs skip whatever is already done. `ship` refuses to promote
|
||||
a commit no RC was cut from. One exception: `ship` carries on past a failed
|
||||
ISO or website step, and a later `ship` exits once stable holds the version
|
||||
and the GitHub release exists. Finish a failed ISO or website step by hand.
|
||||
|
||||
## Promoting a channel
|
||||
|
||||
Ship the tested rc channel to stable (copies packages + signatures, then
|
||||
cleans, rebuilds the database, and syncs):
|
||||
|
||||
```
|
||||
bin/repo advance --from rc --to stable --arch all
|
||||
```
|
||||
|
||||
Open a release train that ships new edge packages by carrying edge into rc
|
||||
first:
|
||||
|
||||
```
|
||||
bin/repo advance --from edge --to rc --arch all
|
||||
```
|
||||
|
||||
`advance` moves x86_64 alone unless given `--arch`. `--arch all` covers the
|
||||
architectures in `PUBLISHED_ARCHES` (`helpers/paths.sh`), x86_64 only by
|
||||
default; set `OMARCHY_ARCHES="x86_64 aarch64"` on the machine that runs it to
|
||||
promote both. The variable is not carried over when `bin/repo` forwards a
|
||||
command over ssh, and `omarchy-release ship` promotes through the same path. It refuses to
|
||||
carry a package into a channel its `channels` metadata excludes.
|
||||
|
||||
## The pin engine
|
||||
|
||||
The release pair is marked `"pinned": true`. It is built for `rc` only from
|
||||
the `rc` branch worktree, with `OMARCHY_RC_PINS=1` set (`omarchy-release rc`
|
||||
sets it), and never built for `stable`: stable gets it by promotion. A merge to
|
||||
`master` therefore cannot overwrite an RC in flight.
|
||||
|
||||
The `omarchy` and `omarchy-settings` packages are released as a pair, always
|
||||
built from the same upstream commit of basecamp/omarchy.
|
||||
|
||||
**Use `bin/omarchy-release`** — it drives the whole train across all four repositories and
|
||||
calls the pin engine below for you.
|
||||
|
||||
`bin/omarchy-pkgs` is that engine, available directly for one-off pins and
|
||||
debugging. It rewrites both PKGBUILDs in lockstep (same `_tag`/`_commit`/
|
||||
`pkgver`/`sha256sums`), validates ordering with `vercmp`, commits, and pushes
|
||||
the current branch. Driven by `omarchy-release` it pins to the release branch
|
||||
on the `rc` branch and orders against the rc channel; invoked directly it
|
||||
targets the current branch and edge.
|
||||
|
||||
```bash
|
||||
bin/omarchy-pkgs release v4.0.0 # Final release from the upstream v4.0.0 tag
|
||||
bin/omarchy-pkgs release rc v4.0.0 # Newest upstream v4.0.0-rcN tag -> 4.0.0rcN
|
||||
bin/omarchy-pkgs release beta v4.0.0 # Same for beta (alpha also supported)
|
||||
bin/omarchy-pkgs release latest # Newest upstream tag, rc/beta included (prompts)
|
||||
bin/omarchy-pkgs release rc # Untagged RC from the quattro tip, auto-numbered
|
||||
bin/omarchy-pkgs release --commit abc123 --base 4.1.0 # Untagged RC from a commit
|
||||
bin/omarchy-pkgs release ... --dry-run # Show the plan; write nothing
|
||||
bin/omarchy-pkgs release ... --no-push # Full flow, local commit only (testing)
|
||||
bin/omarchy-pkgs self-test # Version normalization + ordering tests
|
||||
```
|
||||
|
||||
## Versioning rules
|
||||
|
||||
- Finals are `X.Y.Z`; pre-releases are `X.Y.ZalphaN` / `X.Y.ZbetaN` /
|
||||
`X.Y.ZrcN` in the **attached** form only. pacman's vercmp orders
|
||||
`4.0.0alpha1 < 4.0.0beta1 < 4.0.0rc1 < 4.0.0`, but separator forms
|
||||
(`4.0.0.rc1`, `4.0.0_rc1`) sort **after** `4.0.0` and would strand users on
|
||||
the pre-release — the tooling normalizes upstream tags (`v4.0.0-rc1`,
|
||||
`v4.0.0-rc.1`, ...) to the attached form and refuses anything it cannot
|
||||
normalize. Upstream tags are cut on the quattro branch.
|
||||
- `pkgrel` resets to 1 on every version change. Bump `pkgrel` by hand only to
|
||||
repackage the same source.
|
||||
- `epoch` is never set by tooling. It is sticky forever; adding one is a
|
||||
human decision of last resort.
|
||||
|
||||
## Where releases land
|
||||
|
||||
- **RCs build for the rc channel.** RC testers and RC ISO installs run the real
|
||||
`omarchy` package against the package set stable users will actually get.
|
||||
Stable never sees an rc version; rc testers upgrade rc1 → rc2 → final
|
||||
naturally.
|
||||
- **Finals build into rc, then the whole channel promotes.** After testing, the
|
||||
ship step promotes the exact tested artifacts (packages and signatures)
|
||||
forward:
|
||||
|
||||
```bash
|
||||
bin/repo advance --from rc --to stable --arch all
|
||||
```
|
||||
|
||||
Neither package is on the `fast` ring, and `bin/omarchy-pkgs` never touches
|
||||
stable — promotion is always this explicit step.
|
||||
@@ -0,0 +1,586 @@
|
||||
# The repository host (abandoned)
|
||||
|
||||
**This pipeline is abandoned.** Packages are built and published by GitHub
|
||||
workflows: see the [README](../README.md). Don't follow this page to publish
|
||||
anything.
|
||||
|
||||
The package pipeline used to run on one machine that built, signed and
|
||||
published every channel on a timer. This page is kept as the reference for
|
||||
the tooling that was written for it and is still in the tree: `bin/repo`, the
|
||||
units in `systemd/`, and the host side of the release train
|
||||
([releases.md](releases.md)).
|
||||
|
||||
**That tooling writes to the same bucket as CI.** If you run any of it
|
||||
(`release`, `sync`, `promote`, `push`, `deploy`, `advance`, `remove`), these
|
||||
rules apply:
|
||||
|
||||
- Do not run `bin/repo release`, `sync`, `push` or `deploy` for a package CI
|
||||
publishes. Merge a PR, or dispatch `publish.yml`, instead.
|
||||
- Keep the `omarchy-auto-release-*` and `omarchy-check-versions` timers
|
||||
disabled while CI publishes the same channels. Two writers on one channel
|
||||
database overwrite each other.
|
||||
- Never pass `--prune` to `bin/repo sync`. The host's tree does not hold what
|
||||
CI published, and `--prune` deletes remote files the local tree lacks.
|
||||
- Never rebuild a version that is already published. Bump `pkgrel`.
|
||||
|
||||
## Setting up a host
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
### aarch64 under emulation
|
||||
|
||||
The repository host builds every architecture it publishes on the same
|
||||
machine. A foreign architecture runs under QEMU user emulation, which
|
||||
`bin/build` checks by actually running a container for the target platform.
|
||||
Rootful Docker registers QEMU on first use. Rootless Podman uses the host's
|
||||
registration and prints the one-time Arch setup commands when it is missing or
|
||||
lacks the credential flag required by `sudo` inside the builder:
|
||||
|
||||
```bash
|
||||
# Verify
|
||||
podman run --rm --platform linux/arm64 docker.io/library/alpine:latest uname -m
|
||||
# Should output: aarch64
|
||||
```
|
||||
|
||||
**Note**: emulated builds are much slower than native ones.
|
||||
|
||||
## Published architectures
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
`helpers/paths.sh` names the architectures the host's scheduled pipeline and
|
||||
release train work on. CI does not read it:
|
||||
|
||||
```bash
|
||||
PUBLISHED_ARCHES="${OMARCHY_ARCHES:-x86_64}"
|
||||
```
|
||||
|
||||
That list drives the whole scheduled pipeline. `check-versions` compares
|
||||
PKGBUILDs against each architecture's channel databases and writes one queue
|
||||
file per channel and architecture (`.sync-needed-<channel>-<arch>`);
|
||||
`auto-release <channel>` works through the queues one architecture at a
|
||||
time, each with its own backoff (`.build-failed-<channel>-<arch>`), so a
|
||||
failing build on one architecture never holds up the other; and the release
|
||||
train advances channels with `--arch all`: it takes one host-wide lock and
|
||||
verifies every architecture's source database before moving any of them. The
|
||||
first entry is the reference architecture the release train observes channels
|
||||
through. Rerunning the same advance after a failed remote sync completes it
|
||||
safely.
|
||||
|
||||
Adding an architecture to the scheduled pipeline is therefore one checked-in
|
||||
change to that list: the next `check-versions` tick queues everything the new
|
||||
architecture lacks, and the next `auto-release` tick starts building it. CI
|
||||
does not read this list: it builds the architectures in `CI_ARCHES`, both by
|
||||
default. For a one-off run, override it directly:
|
||||
|
||||
```bash
|
||||
OMARCHY_ARCHES=x86_64 bin/check-versions
|
||||
OMARCHY_ARCHES=aarch64 bin/check-versions
|
||||
OMARCHY_ARCHES="x86_64 aarch64" bin/check-versions
|
||||
```
|
||||
|
||||
The builder image bootstraps
|
||||
`omarchy-keyring` from the x86_64 tree for every architecture, so the first
|
||||
build of a new architecture does not depend on a repository that only it can
|
||||
create.
|
||||
|
||||
## Release in one command
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
The release command is smart and **incremental** - it only builds packages that have changed or are missing. You generally don't need to specify a package manually unless you are debugging a specific failure.
|
||||
|
||||
When a package fails, a completed build run still signs and publishes the packages
|
||||
that succeeded. Failed packages and their blocked dependents remain queued with
|
||||
failure backoff; retries compare against the updated repository and skip the
|
||||
published versions. Only artifacts recorded by fully completed package builds
|
||||
are eligible for a partial release. An interrupted build, a failed publication
|
||||
step, or an incomplete pair using deferred runtime dependencies still stops the
|
||||
release. Reports distinguish partial publication from complete success.
|
||||
|
||||
```bash
|
||||
# Build changed/new packages, sign, promote, clean, update, and sync
|
||||
bin/repo release
|
||||
|
||||
# Stable Mirror
|
||||
bin/repo release --mirror stable
|
||||
|
||||
# ARM64
|
||||
bin/repo release --arch aarch64
|
||||
|
||||
# Build one package (still skipped when its version is already published)
|
||||
bin/repo release --package omarchy-nvim
|
||||
|
||||
# Show what would build without signing/promoting/syncing
|
||||
bin/repo release --dry-run
|
||||
```
|
||||
|
||||
### Step-by-Step
|
||||
|
||||
```bash
|
||||
bin/repo build # Build (unsigned)
|
||||
bin/repo sign # Sign packages
|
||||
bin/repo promote # Copy to production
|
||||
bin/repo clean # Remove old versions
|
||||
bin/repo update # Update database
|
||||
bin/repo sync # Sync to remote
|
||||
```
|
||||
|
||||
## Building Heavy Packages Locally
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
Large packages build faster on a local machine than on the server. Build them
|
||||
here, then hand the artifacts to the repository host, which signs and publishes
|
||||
them:
|
||||
|
||||
```bash
|
||||
bin/repo deploy --package nvidia-580xx-utils # Build here, publish from the host
|
||||
```
|
||||
|
||||
`deploy` is `build` followed by `push`. The two steps are also available
|
||||
separately when a build needs inspecting before it ships:
|
||||
|
||||
```bash
|
||||
bin/build --package nvidia-580xx-utils # Build on the fast machine
|
||||
bin/repo push --package nvidia-580xx-utils # Upload + publish on the host
|
||||
```
|
||||
|
||||
`push` uploads to the host's `build-output/`, verifies checksums, and runs
|
||||
`bin/upload-prebuilt` there. Do not publish from a local checkout instead: a
|
||||
local machine holds neither the complete repository nor a signing key.
|
||||
|
||||
**Name the package.** `build` plans against the local repository database, or
|
||||
against the public channel's when there is none. `deploy` refuses to run
|
||||
unscoped when the local database is missing. Unscoped builds belong on
|
||||
the repository host, where `bin/repo release` does the same job against a real
|
||||
database.
|
||||
|
||||
Every other `bin/repo` command — `sign`, `promote`, `update`, `clean`,
|
||||
`advance`, `remove`, `sync`, `release` — works on the published tree. Run them
|
||||
from anywhere: with a repository host configured `bin/repo` forwards them over
|
||||
ssh to run there (see [Build trigger and the build host](#build-trigger-and-the-build-host)),
|
||||
and `--local` forces execution on the current machine. `bin/repo build`
|
||||
forwards too; call `bin/build` directly, or pass `--local`, to build on this
|
||||
machine. `push` and `deploy` always run locally.
|
||||
|
||||
## Commands
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
### Global Flags
|
||||
|
||||
These flags can be used with all commands:
|
||||
|
||||
- `--mirror <edge|rc|stable>`: Selects the channel (default: `edge`).
|
||||
- `--local`: Run on this machine instead of forwarding to the repository host.
|
||||
- `--arch <x86_64|aarch64>`: Selects the target architecture (default: `x86_64`).
|
||||
|
||||
### Build
|
||||
|
||||
```bash
|
||||
bin/repo build # All packages (x86_64, edge)
|
||||
bin/repo build --arch aarch64 # ARM64
|
||||
bin/repo build --mirror rc # Release-candidate channel
|
||||
bin/repo build --mirror stable # Stable channel
|
||||
bin/repo build --package yay cursor-bin # Specific packages
|
||||
bin/repo build --dry-run # Show what would build
|
||||
```
|
||||
|
||||
**Output**: Unsigned `.pkg.tar.zst` in `build-output/`. Only builds packages whose version differs from what the repository holds.
|
||||
|
||||
Use `--dry-run` to show the build plan without running `makepkg`.
|
||||
|
||||
### Sign
|
||||
|
||||
```bash
|
||||
bin/repo sign
|
||||
```
|
||||
|
||||
Reads the GPG key and passphrase from the environment and signs all packages in `build-output/`. Supports `--arch` and `--mirror`.
|
||||
|
||||
### Promote
|
||||
|
||||
```bash
|
||||
bin/repo promote # Copy to production
|
||||
bin/repo promote --arch aarch64 # ARM64
|
||||
bin/repo promote --dry-run # Preview
|
||||
```
|
||||
|
||||
Copies signed packages from `build-output/` → `pkgs.omarchy.org/`.
|
||||
|
||||
### Clean
|
||||
|
||||
```bash
|
||||
bin/repo clean # Keep 2 versions
|
||||
bin/repo clean --keep 3 # Keep 3 versions
|
||||
bin/repo clean --dry-run # Preview
|
||||
```
|
||||
|
||||
Removes old package versions from the file system. **Does not update the database.**
|
||||
|
||||
### Update
|
||||
|
||||
```bash
|
||||
bin/repo update # Update database
|
||||
```
|
||||
|
||||
Updates the repository database (adding the newest version of each package). Run this after `promote` or `clean`.
|
||||
|
||||
### Sync Repository
|
||||
|
||||
```bash
|
||||
bin/repo sync # Sync current arch/mirror
|
||||
bin/repo sync --mirror stable # Sync stable
|
||||
bin/repo sync --arch aarch64 # Sync ARM64
|
||||
bin/repo sync --skip-prod-check # No confirmation
|
||||
```
|
||||
|
||||
Syncs package repositories to the remote server using rclone based on the configured mirror and architecture.
|
||||
|
||||
**Uploads are additive.** A local tree is not authoritative about what belongs on
|
||||
the remote — `pkgs.omarchy.org/` is gitignored, and packages built on another
|
||||
machine exist only there — so sync never deletes by default. To take a package
|
||||
out of the channels, use the `unpublish.yml` workflow.
|
||||
|
||||
For the same reason sync refuses to publish a repository database built from a
|
||||
tree holding fewer packages than the remote database already lists. The database
|
||||
is what pacman resolves against, so a partial one hides every package it does not
|
||||
know about even though the files are still on the mirror. Use `bin/repo push` to
|
||||
publish packages built on another machine.
|
||||
|
||||
### Deploy
|
||||
|
||||
```bash
|
||||
bin/repo deploy --package nvidia-580xx-utils # Build locally, publish from the host
|
||||
bin/repo deploy --host root@example.com # Point at a specific repo host
|
||||
bin/repo deploy --dry-run # Show the plan, change nothing
|
||||
```
|
||||
|
||||
Runs `build` then `push` in one command. The repository host is resolved before
|
||||
the build starts, so a missing `--host` fails immediately rather than after a long
|
||||
compile.
|
||||
|
||||
### Push to the Repository Host
|
||||
|
||||
```bash
|
||||
bin/repo push # Push everything in build-output
|
||||
bin/repo push --package nvidia-580xx-utils # Push one package
|
||||
bin/repo push --mirror stable --arch aarch64 # Pick mirror and architecture
|
||||
bin/repo push --host root@example.com # Override the repo host
|
||||
bin/repo push --dry-run # Show the plan, transfer nothing
|
||||
```
|
||||
|
||||
Uploads packages from `build-output/` to the repository host and publishes them there
|
||||
with `bin/upload-prebuilt` (sign → promote → update → sync). Use it when a package
|
||||
is quicker to build on a local machine than on the server.
|
||||
|
||||
Publishing happens on the host rather than locally for two reasons: the host
|
||||
has a GPG signing key (CI has its own copy in the `publish` environment), and
|
||||
it holds the repository tree that its database and sync are built from. Local
|
||||
machines therefore need no secrets.
|
||||
|
||||
The host comes from `--host`, `$OMARCHY_REPO_HOST`, then `.repo-host`. The
|
||||
setting is named for the repository rather than for building, which happens
|
||||
wherever you like. The same setting tells `bin/omarchy-pkgs release` which host
|
||||
to poke after a release push.
|
||||
|
||||
`--package` means the same thing as it does to `build`: a pkgbase, whose every
|
||||
output ships together. Pushing `nvidia-580xx-utils` carries `nvidia-580xx-dkms`
|
||||
and `opencl-nvidia-580xx` with it, because that is what the build produced. An
|
||||
output's own name still selects just that one, for publishing a single package
|
||||
on purpose. Omit `--package` to push everything built.
|
||||
|
||||
Publishing signs and promotes everything staged on the host, not just what this
|
||||
push uploaded, so `push` stops when it finds packages already staged there —
|
||||
usually leftovers from a failed run. Remove them on the host, or pass
|
||||
`--include-staged` to publish them too.
|
||||
|
||||
### Other host commands
|
||||
|
||||
```bash
|
||||
bin/repo advance --from rc --to stable # Ship the tested rc channel to stable
|
||||
bin/repo advance --from edge --to rc # Open a train: carry edge forward into rc
|
||||
bin/repo advance --from edge --to rc --package x # Deliberate single-package advance
|
||||
bin/repo advance --from rc --to stable --dry-run # Preview without changing files
|
||||
bin/repo bootstrap-rc # One-time initial rc seed from stable
|
||||
bin/repo timers # Timer schedule, last runs, queues, backoff, lock
|
||||
bin/repo list # List package metadata
|
||||
bin/repo deploy # Build locally, then publish from the host
|
||||
bin/repo push # Upload local builds to the host and publish
|
||||
bin/repo remove <package> # Remove package (host workflow; CI uses unpublish.yml)
|
||||
bin/clean-docker # Clear Docker images/cache (forces fresh rebuild)
|
||||
```
|
||||
|
||||
## Build trigger and the build host
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
Release commands run from anywhere. `bin/repo` is a **remote control**: with a
|
||||
repository host configured, every command that operates on the published tree
|
||||
(`release`, `build`, `sign`, `promote`, `update`, `clean`, `advance`,
|
||||
`bootstrap-rc`, `remove`, `sync`, `migrate`) executes ON the host over ssh —
|
||||
the exact same code, run where the tree lives, so ssh'ing in and running the
|
||||
same commands by hand behaves identically. Pass `--local` to force execution
|
||||
on the current machine. `list`, `push`, `deploy`, and `setup` never forward
|
||||
(`push`/`deploy` exist precisely to move local builds *to* the host).
|
||||
|
||||
Without a configured host, commands run locally — which on the build host
|
||||
itself (no `.repo-host` there) is exactly right, and elsewhere the exact
|
||||
commands to run are printed by the orchestrator, with the 5-minute
|
||||
auto-release timer as the backstop.
|
||||
|
||||
The host setting is any destination `ssh` accepts, resolved in this order:
|
||||
|
||||
1. `--host <dest>`, for `push`, `deploy` and `bin/omarchy-release`
|
||||
2. `OMARCHY_REPO_HOST` environment variable
|
||||
3. the git-ignored `.repo-host` file (one line; `#` comments allowed)
|
||||
|
||||
The server layout lives under `/root`, so the value is `root@<ip>`,
|
||||
`root@<hostname>`, or — nicest — a `Host` alias from `~/.ssh/config` that
|
||||
carries the user, key, and port:
|
||||
|
||||
```
|
||||
# .repo-host
|
||||
root@pkgs.example.com
|
||||
```
|
||||
|
||||
All connections are plain ssh; nothing else is used to reach the host.
|
||||
|
||||
**How "this machine is the build host" is detected — and its one caveat.**
|
||||
The marker is the published database living in this checkout
|
||||
(`pkgs.omarchy.org/<channel>/<arch>/omarchy.db*`), the same convention the
|
||||
rest of `bin/` uses. A workstation that once ran a full local
|
||||
`bin/repo release` carries that marker too and would infer it is the host.
|
||||
An explicitly configured destination always outranks the inference — `--host`,
|
||||
`OMARCHY_REPO_HOST`, and `.repo-host` are checked first, and only when none is
|
||||
set does local detection apply. So if a machine ever misidentifies itself,
|
||||
writing the real host into `.repo-host` is the fix.
|
||||
|
||||
## Directory Structure
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
```
|
||||
omarchy-pkgs/
|
||||
├── pkgbuilds/ # Source PKGBUILDs
|
||||
│ └── package-name/
|
||||
│ ├── PKGBUILD
|
||||
│ └── .omarchy/
|
||||
│ ├── package.json # Source/sync/release metadata
|
||||
│ └── upstream.sh # Optional custom vendor release feed hook
|
||||
├── build/
|
||||
├── build-output/ # Unsigned packages (temporary)
|
||||
│ ├── edge/ # (rc/ and stable/ alongside, each x86_64 + aarch64)
|
||||
│ ├── rc/
|
||||
│ └── stable/
|
||||
├── pkgs.omarchy.org/ # Signed packages (production)
|
||||
│ ├── .release.lock # Host-wide lock: one channel mutation at a time
|
||||
│ ├── edge/ # Each channel: x86_64/ and aarch64/
|
||||
│ ├── rc/
|
||||
│ └── stable/
|
||||
└── bin/ # CLI tools (on host)
|
||||
```
|
||||
|
||||
## Architecture-Specific Notes
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
### x86_64
|
||||
- Native builds (fast)
|
||||
- Mirrors: mirror.omarchy.org, rackspace, pkgbuild.com
|
||||
|
||||
### aarch64
|
||||
- Built on the repository host like x86_64; under QEMU when the host is x86_64
|
||||
- On an ARM host, package builds and the signing/database utility containers
|
||||
run natively; only an explicitly requested x86_64 package build is emulated
|
||||
- Uses Arch Linux ARM repositories through the same HTTPS mirror for every
|
||||
channel (Arch Linux ARM publishes no dated snapshots to pin a channel's base)
|
||||
- Additional repos: `[alarm]`, `[aur]`
|
||||
- Same workflow, just add `--arch aarch64`; the scheduled pipeline runs it
|
||||
automatically once `aarch64` is in `PUBLISHED_ARCHES`
|
||||
- Packages whose `arch=()` lacks `aarch64` are skipped, not failed
|
||||
|
||||
### Building for Both Architectures
|
||||
|
||||
```bash
|
||||
# Build x86_64
|
||||
bin/repo release --package myapp
|
||||
|
||||
# Build aarch64
|
||||
bin/repo release --arch aarch64 --package myapp
|
||||
|
||||
# Sync both
|
||||
bin/repo sync
|
||||
bin/repo sync --arch aarch64
|
||||
```
|
||||
|
||||
## Version Management
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
Packages are only rebuilt if:
|
||||
- PKGBUILD version differs from the repository version
|
||||
- Package doesn't exist in production
|
||||
|
||||
A package that has to be rebuilt because something underneath it changed is handled by turning that into a version change: `bin/sync-rebuilds` bumps pkgrel when a dependency named in `rebuild_on` moves.
|
||||
|
||||
## Scheduled releases on the host
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
Four systemd units in `systemd/` drive unattended releases from the host.
|
||||
|
||||
All four units run **every 5 minutes**, staggered by a minute each, so a push
|
||||
reaches the mirror in minutes rather than hours:
|
||||
|
||||
1. **check-versions** (`*:0/5`): Pulls latest from git, compares PKGBUILD versions to published versions for every published architecture, creates one state file per channel and architecture if builds are needed
|
||||
2. **auto-release-edge** (`*:1/5`): For each published architecture with a state file, builds all edge packages that need updates
|
||||
3. **auto-release-rc** (`*:2/5`): Builds fast-ring packages for rc, from the main checkout like the other two — natively in the rc image, not copied from another channel. The pinned release pair is built separately by `omarchy-release rc` in the `rc` branch worktree
|
||||
4. **auto-release-stable** (`*:3/5`): If a state file exists, builds `release_ring=fast` packages for stable
|
||||
|
||||
That cadence is only safe because of three guards:
|
||||
|
||||
- **No overlap.** Every channel-mutating run takes a host-wide lock
|
||||
(`pkgs.omarchy.org/.release.lock`). Scheduled runs take it
|
||||
**non-blocking**: if a build is already going, the tick exits immediately
|
||||
instead of queuing. Waiting would stack one stalled process per tick behind
|
||||
a long build and stampede when it finished. Manual commands still wait, as
|
||||
an operator expects. `check-versions` takes it too — its `git pull` would
|
||||
otherwise swap PKGBUILDs out from under a running build.
|
||||
- **Backoff on failure.** A failed release records the attempt in
|
||||
`.build-failed-<channel>-<arch>` and backs off exponentially — 10m, 20m, 40m, up to
|
||||
a 6h ceiling — instead of rebuilding the same broken tree every 5 minutes.
|
||||
**Any new commit clears the backoff immediately**, since a push is the most
|
||||
likely fix. Clear it by hand with
|
||||
`rm /root/.state/.build-failed-<channel>-<arch>`.
|
||||
- **Quiet when idle.** With nothing queued a tick exits without output, so the
|
||||
journal shows the runs that mattered rather than 288 no-ops a day.
|
||||
|
||||
`bin/repo timers` reports all of this: schedules, last results, what is
|
||||
queued, what is failing and when it will retry, and whether the lock is held.
|
||||
|
||||
## Build reports
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
Every release run reports to Basecamp Campfire — not just failures, so a push
|
||||
can be followed all the way to the mirror without watching the host:
|
||||
|
||||
| Event | Message |
|
||||
|---|---|
|
||||
| 🔨 Started | channel, arch, host, the commit being built, and which packages are queued |
|
||||
| ✅ Published | the packages and versions that went out, duration, and the channel URL |
|
||||
| 📦 Promoted | what `advance` moved between channels (including the rc bootstrap) |
|
||||
| 📦 Nothing to publish | a queued run built nothing — see below |
|
||||
| 🔴 Failed | which step failed, the commit, and the last 25 log lines |
|
||||
|
||||
Reports are tied to release *runs*, not timer ticks: a tick with nothing
|
||||
queued exits silently, so a quiet day is a quiet chat. That is what makes the
|
||||
"nothing to publish" report meaningful rather than routine — a release only
|
||||
runs when the version check queued work, so building nothing means the check
|
||||
and the builder disagree about what is out of date. It names the packages that
|
||||
were queued but not built, which is where to start looking.
|
||||
|
||||
By default everything posts to `BASECAMP_CHATBOT_URL`, the same chat the
|
||||
sync workflows use — one variable, nothing extra to configure.
|
||||
|
||||
If release traffic starts drowning that chat, give it its own: create a second
|
||||
Basecamp chat, add a chatbot integration to it, and export its lines URL
|
||||
alongside the existing one in `/root/.omarchy/build-credentials`:
|
||||
|
||||
```bash
|
||||
export OMARCHY_RELEASE_CHATBOT_URL="https://3.basecamp.com/<account>/integrations/<key>/buckets/<project>/chats/<chat>/lines"
|
||||
```
|
||||
|
||||
Release reports then go there while the sync workflows keep posting to
|
||||
`BASECAMP_CHATBOT_URL`. With neither set, reports are silently skipped.
|
||||
`bin/setup` reports which of the three cases applies.
|
||||
|
||||
Check on all of it with `bin/repo timers` — schedule, each unit's last run and
|
||||
whether it succeeded, what is queued, whether a release is running right now,
|
||||
and any failed units. Like the other host commands it forwards over ssh, so
|
||||
the build box's state is one command away from any machine:
|
||||
|
||||
```bash
|
||||
bin/repo timers # runs on the repository host when one is configured
|
||||
bin/repo timers --local # inspect this machine instead
|
||||
```
|
||||
|
||||
State files are stored in `/root/.state/`:
|
||||
- `.sync-needed-<channel>-<arch>` — the packages queued for that channel and
|
||||
architecture, one per line; the release run reads them to name what it is
|
||||
building
|
||||
- `.build-failed-<channel>-<arch>` — consecutive failure count, timestamp, and
|
||||
the commit it failed on (drives the backoff; removing it forces a retry)
|
||||
|
||||
Legacy files without the architecture suffix are consumed once as x86_64
|
||||
state, so upgrading the host does not lose an in-flight build.
|
||||
|
||||
## Schedule (America/New_York)
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
| Minute of every hour | Action |
|
||||
|------|--------|
|
||||
| :00, :05, :10, … | check-versions (git pull + creates state files) |
|
||||
| :01, :06, :11, … | auto-release-edge |
|
||||
| :02, :07, :12, … | auto-release-rc |
|
||||
| :03, :08, :13, … | auto-release-stable |
|
||||
|
||||
Each release unit is a no-op when its channel has nothing queued, another run
|
||||
holds the lock, or the channel is in failure backoff.
|
||||
|
||||
## Installation
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
```bash
|
||||
ssh root@<host> 'cd /root/omarchy-pkgs && bin/setup --skip-timers'
|
||||
```
|
||||
|
||||
`bin/setup` installs the dependencies, ensures Docker is running and creates
|
||||
the state directory. Without `--skip-timers` it also installs and enables the
|
||||
release timers, which must stay off while CI publishes. It works on
|
||||
Debian/Ubuntu and on Arch, and is idempotent, so run it again whenever a
|
||||
dependency is added.
|
||||
|
||||
The host does not need to be Arch: makepkg, repo-add and package signing all
|
||||
run inside containers, so it needs only Docker, rclone, bsdtar, jq, git and
|
||||
rsync. Docker is left alone when it already works, rather than replacing a
|
||||
working installation from Docker's own repository with the distribution's.
|
||||
|
||||
```bash
|
||||
bin/repo setup --check # Report what is missing, change nothing
|
||||
bin/repo setup --skip-timers # Prepare the host without the release timers
|
||||
```
|
||||
|
||||
Signing credentials (`/root/.omarchy/build-credentials`) and the rclone remote
|
||||
hold secrets, so setup reports on them rather than creating them.
|
||||
|
||||
## Management
|
||||
|
||||
> Abandoned. Kept as reference for the tooling; don't follow it to publish.
|
||||
|
||||
```bash
|
||||
# Everything at a glance: schedules, last runs, queues, backoff, lock
|
||||
bin/repo timers # forwards to the host when one is configured
|
||||
|
||||
# Manual trigger (edge, rc, stable)
|
||||
systemctl start omarchy-check-versions.service
|
||||
systemctl start omarchy-auto-release-edge.service
|
||||
|
||||
# View logs
|
||||
journalctl -u omarchy-auto-release-edge.service -n 50
|
||||
|
||||
# Clear a channel stuck in failure backoff (a new commit also clears it)
|
||||
rm /root/.state/.build-failed-edge-x86_64
|
||||
|
||||
# Release lock left behind by a killed run (bin/repo timers shows if it is live)
|
||||
rm /root/omarchy-pkgs/pkgs.omarchy.org/.release.lock
|
||||
```
|
||||
|
||||
With the timers enabled, `check-versions` pulls the main checkout on its
|
||||
5-minute tick. With them disabled, nothing does: `bin/repo` pulls before a
|
||||
command it forwards, and a command run on the host itself needs a `git pull`
|
||||
first. The checkout must be on `master`.
|
||||
@@ -220,3 +220,185 @@ These packages were already excluded from automatic AUR updates. The migration p
|
||||
- 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.
|
||||
|
||||
## How the sync PR builds
|
||||
|
||||
`sync-upstream.yml` pushes its PR with the built-in `GITHUB_TOKEN`, so GitHub
|
||||
holds the PR's build and test runs for approval. The workflow labels its own
|
||||
PR `build-approved`, and its `approve` job releases the held runs for each
|
||||
commit it pushes. A push to an `auto/sync-*` branch does not cancel the PR's
|
||||
build in flight: the new build waits, then reuses every artifact the finished
|
||||
one uploaded.
|
||||
|
||||
Because of that push, GitHub starts no `pull_request_target` workflow for the
|
||||
PR, so `auto-merge-pr.yml` never arms it: a maintainer merges it.
|
||||
|
||||
A run started by hand with `packages` opens its own PR on
|
||||
`auto/sync-upstream-<packages>`. The next scheduled run still picks the same
|
||||
update up in the shared PR if it has not merged by then; identical package
|
||||
trees reuse the same build artifacts.
|
||||
|
||||
## Declarative providers and hooks
|
||||
|
||||
The older provider form, still in use beside `upstream.watch`. Give a new
|
||||
package an `upstream.watch`; `helpers/upstream-watch.py check` validates that
|
||||
form only.
|
||||
|
||||
```bash
|
||||
bin/sync-upstream # Update every package with an upstream hook
|
||||
bin/sync-upstream openai-codex-desktop # Update specific packages
|
||||
```
|
||||
|
||||
A package declares where its releases come from either as data or, for an
|
||||
unusual feed, a small hook.
|
||||
|
||||
A vendor shipping tagged GitHub releases is pure data, declared as `upstream`
|
||||
in `.omarchy/package.json` with no code at all:
|
||||
|
||||
```json
|
||||
"upstream": {
|
||||
"github": "jdx/mise",
|
||||
"checksums": "SHASUMS256.txt",
|
||||
"assets": {
|
||||
"x86_64": "mise-{tag}-linux-x64.tar.xz",
|
||||
"aarch64": "mise-{tag}-linux-arm64.tar.xz"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
`checksums` names the manifest asset the vendor publishes. A vendor publishing
|
||||
none sets `"digests": true` instead, and the checksums come from the SHA-256
|
||||
digest GitHub's release API reports for every asset — see
|
||||
`pkgbuilds/schist-bin/.omarchy/package.json`. Either way the artifacts
|
||||
themselves are never downloaded.
|
||||
|
||||
An architecture may map to an ordered array when its PKGBUILD downloads more
|
||||
than one release asset. Small versioned files outside the release assets can be
|
||||
listed under `sources` and are downloaded and hashed when a new version appears:
|
||||
|
||||
```json
|
||||
"upstream": {
|
||||
"github": "owner/project",
|
||||
"digests": true,
|
||||
"assets": {
|
||||
"x86_64": ["tool-{pkgver}-x86_64", "tool-{pkgver}-x86_64.asc"],
|
||||
"aarch64": ["tool-{pkgver}-aarch64", "tool-{pkgver}-aarch64.asc"]
|
||||
},
|
||||
"sources": {
|
||||
"any": ["https://raw.githubusercontent.com/owner/project/{tag}/LICENSE"]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Asset and source keys must be disjoint because each key maps to one PKGBUILD
|
||||
checksum array (`any` means the unsuffixed `sha256sums`).
|
||||
|
||||
Repositories whose historical releases use incompatible tag schemes may set
|
||||
`"latest_only": true`. The provider then considers only the newest stable
|
||||
GitHub release, while retaining all validation for that release. A quarantine
|
||||
will wait for that release to age instead of falling back to an older one.
|
||||
|
||||
`{tag}` and `{pkgver}` interpolate into asset names; a leading `v` on the tag is
|
||||
stripped for `pkgver`; drafts and prereleases are ignored. Only the 100 most
|
||||
recent releases are considered. The provider fails closed on anything it cannot
|
||||
read — an unusable tag, timestamp, or checksum stops the sync rather than being
|
||||
skipped.
|
||||
|
||||
Projects that publish version tags but no checksum manifest can declare the
|
||||
tag repository, the exact tag shape, and every source that should be hashed:
|
||||
|
||||
```json
|
||||
"upstream": {
|
||||
"git_tags": "https://github.com/owner/project.git",
|
||||
"tag_pattern": "v{pkgver}",
|
||||
"sources": {
|
||||
"any": ["https://github.com/owner/project/archive/refs/tags/{tag}.tar.gz"]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
The newest matching tag is selected with pacman's `vercmp`; unrelated tags are
|
||||
ignored. `tag_pattern` must contain exactly one `{pkgver}`. Source templates may
|
||||
use `{tag}` and `{pkgver}`. Each expanded URL must be HTTPS and is downloaded
|
||||
only when the discovered version is newer. A checked-in patch or other local
|
||||
source can be included as `file:patch-name.patch`; it is hashed from the package
|
||||
directory. Keys such as `any`, `x86_64`, and `aarch64` select the corresponding
|
||||
`sha256sums` array.
|
||||
|
||||
npm packages use the same source mapping, with `{npm_tarball}` available for
|
||||
the tarball named by the selected dist-tag:
|
||||
|
||||
```json
|
||||
"upstream": {
|
||||
"npm": "@scope/package",
|
||||
"dist_tag": "latest",
|
||||
"sources": {
|
||||
"any": ["{npm_tarball}", "https://example.com/v{pkgver}/CHANGELOG.md"]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
`dist_tag` defaults to `latest`. The registry's publication timestamp is
|
||||
carried into the provider result, so `min_release_age` works for npm packages.
|
||||
|
||||
A vendor with a plain-text Debian `Packages` index can use it to discover the
|
||||
newest exact package version, then hash immutable source URLs:
|
||||
|
||||
```json
|
||||
"upstream": {
|
||||
"debian": "https://example.com/debian/dists/stable/main/binary-amd64/Packages",
|
||||
"package": "example-app",
|
||||
"sources": {
|
||||
"x86_64": ["https://example.com/tool-{pkgver}-x64.tar.gz"],
|
||||
"aarch64": ["https://example.com/tool-{pkgver}-arm64.tar.gz"]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
This deliberately accepts only Debian versions that are already valid Arch
|
||||
`pkgver` values. Feeds needing epoch, revision, or filename translation retain
|
||||
a hook. Exactly one of `github`, `git_tags`, `npm`, or `debian` may appear in a
|
||||
declaration.
|
||||
|
||||
A timestamped provider may also declare `"min_release_age": "24h"`
|
||||
(`s`/`m`/`h`/`d` suffix or bare seconds) to quarantine fresh releases until
|
||||
maintainers have had time to pull a bad or compromised one. GitHub Releases and
|
||||
npm provide publication times; raw git tags and Debian Packages indexes do not,
|
||||
so combining either with this policy fails closed. The newest release that has
|
||||
cleared the window ships, so a fast release cadence cannot starve updates. The
|
||||
window is enforced
|
||||
centrally: whatever reports the release must prove its age via `published_at`,
|
||||
or the sync fails. A maintainer deliberately shipping inside the window runs
|
||||
`BYPASS_MIN_RELEASE_AGE=1 bin/sync-upstream <package>` locally and merges the
|
||||
result through a normal PR; scheduled automation never sets the bypass.
|
||||
|
||||
A vendor whose feed fits no convention (a Debian package index, a bare
|
||||
version.txt) instead provides `.omarchy/upstream.sh`, a hook that reports the
|
||||
newest upstream release as JSON on stdout — declaring both an `upstream` block
|
||||
and a hook is an error:
|
||||
|
||||
```json
|
||||
{
|
||||
"pkgver": "1.2.3",
|
||||
"sha256sums": { "x86_64": ["<sha256>"], "aarch64": ["<sha256>"] }
|
||||
}
|
||||
```
|
||||
|
||||
Architecture keys become `sha256sums_<arch>` in the PKGBUILD; the key `any` means
|
||||
the unsuffixed `sha256sums` array, and only the arrays a hook names are touched.
|
||||
An empty object (`{}`) reports no update, which is how a hook waits out a release
|
||||
that has landed for one architecture but not yet the other.
|
||||
|
||||
When the reported version is newer than the checked-in one, `bin/sync-upstream`
|
||||
rewrites `pkgver` and those checksum arrays and resets `pkgrel` to 1. A version
|
||||
that is equal or older leaves the package alone, so a vendor rolling a release
|
||||
back cannot walk the repository backwards.
|
||||
|
||||
Hooks should read checksums from whatever manifest the vendor publishes rather
|
||||
than downloading the artifacts — see `pkgbuilds/openai-codex-desktop/.omarchy/upstream.sh`,
|
||||
which reads OpenAI's Debian package index and never fetches the 750 MB of debs
|
||||
it describes. Hooks honoring `min_release_age` receive the window as
|
||||
`MIN_RELEASE_AGE_SECONDS` and report `published_at` alongside `pkgver`.
|
||||
|
||||
`bin/sync-upstream self-test` runs offline fixture tests over the release
|
||||
selection, quarantine backstop, duration parsing, and manifest validation.
|
||||
Reference in new issue
Block a user