Skip to content

Commit a3fb879

Browse files
authored
chore: rename Phase 2 bucket repos to apt-wheels / yum-wheels for naming consistency (#2788)
Phase 2 Linux native-repo templates and dispatch wiring referenced `wheels-dev/apt-wheels-dev` and `wheels-dev/yum-wheels-dev`. The `-dev` suffix appeared to mirror the DNS form (`apt.wheels.dev` → `apt-wheels-dev`) but reads as a redundant org echo inside the `wheels-dev` org and breaks the established `<package-manager>-wheels` naming used by the other sister repos (`homebrew-wheels`, `scoop-wheels`, `chocolatey-wheels`). Rename everywhere to drop the `-dev` suffix: - wheels-dev/apt-wheels-dev → wheels-dev/apt-wheels - wheels-dev/yum-wheels-dev → wheels-dev/yum-wheels The actual bucket repos were just created under the new names today (2026-05-21 ~20:15 UTC), so this PR brings the templates / docs / release-workflow dispatch in sync with the on-GitHub reality before the first end-to-end dispatch fires. No live infrastructure references the old names yet — Cloudflare Pages, DNS, and the bucket-side CI secrets all post-date this rename. Mechanical substitution across 9 files (27 references). Stable `wheels` package name (the bare `wheels` in nfpm configs and `apt install wheels` snippets) is untouched — only the org-namespaced repo names change. Signed-off-by: Peter Amiri <peter@alurium.com>
1 parent 93ba712 commit a3fb879

9 files changed

Lines changed: 27 additions & 27 deletions

File tree

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
DOWNSTREAM_DISPATCH_TOKEN:
2424
required: false
2525
# Optional — when present, the build job's "Dispatch Linux repo buckets"
26-
# step fires repository_dispatch on apt-wheels-dev / yum-wheels-dev so
26+
# step fires repository_dispatch on apt-wheels / yum-wheels so
2727
# their metadata regen workflows pick up the new .deb/.rpm and republish
2828
# apt.wheels.dev / yum.wheels.dev within minutes. When absent, the step
2929
# skips silently — the bucket repos can be populated manually via each
@@ -306,7 +306,7 @@ jobs:
306306
# CHANNEL derives from the version so develop snapshots produce the
307307
# `wheels-be` package (which the Phase 2 bleeding-edge receiver
308308
# downloads) instead of `wheels`. Without this, the snapshot release
309-
# ships `wheels_<v>_amd64.deb` and the apt-wheels-dev / yum-wheels-dev
309+
# ships `wheels_<v>_amd64.deb` and the apt-wheels / yum-wheels
310310
# receiver workflow 404s on its `wheels-be_<v>_amd64.deb` fetch.
311311
# RC builds keep CHANNEL=stable — RCs aren't fanned out to apt/yum
312312
# (see release.yml § "Dispatch Linux repo buckets").
@@ -588,8 +588,8 @@ jobs:
588588
#############################################
589589
# Dispatch Linux repo buckets (apt.wheels.dev / yum.wheels.dev)
590590
#
591-
# Fires repository_dispatch on wheels-dev/apt-wheels-dev and
592-
# wheels-dev/yum-wheels-dev so their metadata-regen workflows pick up
591+
# Fires repository_dispatch on wheels-dev/apt-wheels and
592+
# wheels-dev/yum-wheels so their metadata-regen workflows pick up
593593
# the new .deb / .rpm asset and republish apt.wheels.dev /
594594
# yum.wheels.dev within minutes. See issue #2605.
595595
#
@@ -616,7 +616,7 @@ jobs:
616616
fi
617617
618618
# Same channel derivation as the homebrew/scoop dispatch.
619-
# apt-wheels-dev / yum-wheels-dev route on `channel` in the payload
619+
# apt-wheels / yum-wheels route on `channel` in the payload
620620
# to slot the .deb/.rpm into the right pool (stable vs bleeding-edge).
621621
# RC releases aren't currently published to apt/yum, so we skip them.
622622
if echo "${WHEELS_RELEASE_VERSION}" | grep -qiE '\-snapshot[\.\+]'; then
@@ -632,7 +632,7 @@ jobs:
632632
# Static event type, fixed repo list — no untrusted input flows into
633633
# the curl arguments. WHEELS_RELEASE_VERSION is generated earlier in
634634
# the same workflow from wheels.json + run number.
635-
for repo in apt-wheels-dev yum-wheels-dev; do
635+
for repo in apt-wheels yum-wheels; do
636636
echo "Dispatching wheels-released to wheels-dev/${repo}..."
637637
http_status=$(curl -sS -o /tmp/linux-dispatch-resp.txt -w "%{http_code}" \
638638
-X POST \

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ jobs:
215215
FORGEBOX_PASS: ${{ secrets.FORGEBOX_PASS }}
216216
DOWNSTREAM_DISPATCH_TOKEN: ${{ secrets.DOWNSTREAM_DISPATCH_TOKEN }}
217217
# Optional: when present, the build job's "Dispatch Linux repo buckets"
218-
# step fires repository_dispatch on apt-wheels-dev / yum-wheels-dev so
218+
# step fires repository_dispatch on apt-wheels / yum-wheels so
219219
# the bleeding-edge channel of apt.wheels.dev / yum.wheels.dev tracks
220220
# every develop push. When absent, the step skips silently. See #2605.
221221
LINUX_REPO_DISPATCH_TOKEN: ${{ secrets.LINUX_REPO_DISPATCH_TOKEN }}

tools/distribution-drafts/apt-repo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# `apt-wheels-dev` bucket repo template
1+
# `apt-wheels` bucket repo template
22

3-
This directory is the **template** for the standalone `wheels-dev/apt-wheels-dev`
3+
This directory is the **template** for the standalone `wheels-dev/apt-wheels`
44
repository that backs `https://apt.wheels.dev`. The bucket repo holds the static
55
apt metadata tree plus the pooled `.deb` artifacts, and is auto-deployed to
66
Cloudflare Pages on every push.
@@ -105,7 +105,7 @@ Before this bucket repo will function:
105105
the apex domain `apt.wheels.dev`. The build command is empty (the repo
106106
*is* the static site); the output dir is `./`.
107107
3. **CI secrets** (set on the bucket repo at
108-
`https://github.com/wheels-dev/apt-wheels-dev/settings/secrets/actions`):
108+
`https://github.com/wheels-dev/apt-wheels/settings/secrets/actions`):
109109
- `WHEELS_REPO_GPG_PRIVATE_KEY` — ASCII-armored private key
110110
- `WHEELS_REPO_GPG_PASSPHRASE` — passphrase
111111
4. **Upstream dispatch** — the release workflow in `wheels-dev/wheels`

tools/distribution-drafts/apt-repo/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h2>Upgrading</h2>
7979
<pre><code>sudo apt update &amp;&amp; sudo apt upgrade wheels # or wheels-be</code></pre>
8080

8181
<h2>Signing key</h2>
82-
<p>The repository is signed with the Wheels project key. The public half is published at <a href="/wheels.gpg"><code>/wheels.gpg</code></a>. The fingerprint is committed to the <a href="https://github.com/wheels-dev/apt-wheels-dev">source repo</a> in <code>FINGERPRINT</code> for offline verification.</p>
82+
<p>The repository is signed with the Wheels project key. The public half is published at <a href="/wheels.gpg"><code>/wheels.gpg</code></a>. The fingerprint is committed to the <a href="https://github.com/wheels-dev/apt-wheels">source repo</a> in <code>FINGERPRINT</code> for offline verification.</p>
8383

8484
<h2>Other platforms</h2>
8585
<ul>
@@ -89,7 +89,7 @@ <h2>Other platforms</h2>
8989
</ul>
9090

9191
<footer>
92-
<p>Hosted on Cloudflare Pages. Repository contents at <a href="https://github.com/wheels-dev/apt-wheels-dev">wheels-dev/apt-wheels-dev</a>.</p>
92+
<p>Hosted on Cloudflare Pages. Repository contents at <a href="https://github.com/wheels-dev/apt-wheels">wheels-dev/apt-wheels</a>.</p>
9393
</footer>
9494
</main>
9595
</body>

tools/distribution-drafts/apt-repo/workflows/wheels-released.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Receiver workflow for `wheels-dev/apt-wheels-dev`.
1+
# Receiver workflow for `wheels-dev/apt-wheels`.
22
#
33
# Listens for `repository_dispatch` from `wheels-dev/wheels`'s release workflow,
44
# downloads the new `.deb` asset from the upstream GitHub Release, slots it

tools/distribution-drafts/linux-packages/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Practical impact for this directory:
6565
Two new repos (separate from the source monorepo, mirroring the snapshots-repo
6666
pattern):
6767

68-
- `wheels-dev/apt-wheels-dev` — Cloudflare Pages site at `apt.wheels.dev`
69-
- `wheels-dev/yum-wheels-dev` — Cloudflare Pages site at `yum.wheels.dev`
68+
- `wheels-dev/apt-wheels` — Cloudflare Pages site at `apt.wheels.dev`
69+
- `wheels-dev/yum-wheels` — Cloudflare Pages site at `yum.wheels.dev`
7070

7171
Each repo holds the static metadata tree (Packages.gz, repodata/, etc.) plus
7272
the `.deb` / `.rpm` files in a `pool/` directory. A CI workflow listens for
@@ -129,27 +129,27 @@ The remaining work is operational:
129129
`wheels.gpg` (template placeholders live at
130130
`<bucket>/templates/wheels.gpg.placeholder`).
131131
2. **Create the two bucket repos** under `wheels-dev`:
132-
- `wheels-dev/apt-wheels-dev` — copy contents of `apt-repo/` template
133-
- `wheels-dev/yum-wheels-dev` — copy contents of `yum-repo/` template
132+
- `wheels-dev/apt-wheels` — copy contents of `apt-repo/` template
133+
- `wheels-dev/yum-wheels` — copy contents of `yum-repo/` template
134134
3. **Create two CF Pages projects** pointing at the new repos, binding the
135135
apex domains:
136-
- `wheels-dev/apt-wheels-dev``apt.wheels.dev`
137-
- `wheels-dev/yum-wheels-dev``yum.wheels.dev`
136+
- `wheels-dev/apt-wheels``apt.wheels.dev`
137+
- `wheels-dev/yum-wheels``yum.wheels.dev`
138138
4. **Add CI secrets** to `wheels-dev/wheels` (for the dispatch sender) and to
139139
each bucket repo (for the signing receiver):
140140
- On `wheels-dev/wheels`:
141141
- `LINUX_REPO_DISPATCH_TOKEN` — fine-grained PAT with `actions: write`
142142
on both bucket repos. The dispatch step in `release.yml` skips
143143
silently when this secret is unset, so it's safe to land the wiring
144144
before the bucket repos exist.
145-
- On each bucket repo (`apt-wheels-dev`, `yum-wheels-dev`):
145+
- On each bucket repo (`apt-wheels`, `yum-wheels`):
146146
- `WHEELS_REPO_GPG_PRIVATE_KEY` — ASCII-armored private key
147147
- `WHEELS_REPO_GPG_PASSPHRASE` — passphrase
148148
5. **Smoke-test** by running the bucket-repo workflows manually (each
149149
supports `workflow_dispatch` for backfill). For the apt bucket:
150150
```
151151
gh workflow run wheels-released.yml \
152-
--repo wheels-dev/apt-wheels-dev \
152+
--repo wheels-dev/apt-wheels \
153153
-f version=4.0.0 -f channel=stable
154154
```
155155
then verify the published tree on a fresh Debian/Ubuntu host. Do the same

tools/distribution-drafts/yum-repo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# `yum-wheels-dev` bucket repo template
1+
# `yum-wheels` bucket repo template
22

3-
This directory is the **template** for the standalone `wheels-dev/yum-wheels-dev`
3+
This directory is the **template** for the standalone `wheels-dev/yum-wheels`
44
repository that backs `https://yum.wheels.dev`. The bucket repo holds the
55
static yum metadata tree plus the pooled `.rpm` artifacts, and is auto-deployed
66
to Cloudflare Pages on every push.
@@ -79,7 +79,7 @@ so `rpmvercmp` orders snapshot releases below the next GA correctly.
7979
Same GPG key as the apt repo (one key for both, importable on both clients
8080
via `https://apt.wheels.dev/wheels.gpg` or `https://yum.wheels.dev/wheels.gpg`).
8181

82-
CI secrets on `https://github.com/wheels-dev/yum-wheels-dev/settings/secrets/actions`:
82+
CI secrets on `https://github.com/wheels-dev/yum-wheels/settings/secrets/actions`:
8383
- `WHEELS_REPO_GPG_PRIVATE_KEY` — ASCII-armored private key
8484
- `WHEELS_REPO_GPG_PASSPHRASE` — passphrase
8585

tools/distribution-drafts/yum-repo/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h2>Upgrading</h2>
7272
<pre><code>sudo dnf upgrade wheels # or wheels-be</code></pre>
7373

7474
<h2>Signing key</h2>
75-
<p>The repository is signed with the Wheels project key. The public half is published at <a href="/wheels.gpg"><code>/wheels.gpg</code></a>. Both <code>.repo</code> files reference it via <code>gpgkey=</code>, so <code>dnf</code> imports it automatically on first refresh. The fingerprint is committed to the <a href="https://github.com/wheels-dev/yum-wheels-dev">source repo</a> in <code>FINGERPRINT</code> for offline verification.</p>
75+
<p>The repository is signed with the Wheels project key. The public half is published at <a href="/wheels.gpg"><code>/wheels.gpg</code></a>. Both <code>.repo</code> files reference it via <code>gpgkey=</code>, so <code>dnf</code> imports it automatically on first refresh. The fingerprint is committed to the <a href="https://github.com/wheels-dev/yum-wheels">source repo</a> in <code>FINGERPRINT</code> for offline verification.</p>
7676

7777
<h2>Other platforms</h2>
7878
<ul>
@@ -82,7 +82,7 @@ <h2>Other platforms</h2>
8282
</ul>
8383

8484
<footer>
85-
<p>Hosted on Cloudflare Pages. Repository contents at <a href="https://github.com/wheels-dev/yum-wheels-dev">wheels-dev/yum-wheels-dev</a>.</p>
85+
<p>Hosted on Cloudflare Pages. Repository contents at <a href="https://github.com/wheels-dev/yum-wheels">wheels-dev/yum-wheels</a>.</p>
8686
</footer>
8787
</main>
8888
</body>

tools/distribution-drafts/yum-repo/workflows/wheels-released.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Receiver workflow for `wheels-dev/yum-wheels-dev`.
1+
# Receiver workflow for `wheels-dev/yum-wheels`.
22
#
33
# Listens for `repository_dispatch` from `wheels-dev/wheels`'s release workflow,
44
# downloads the new `.rpm` asset from the upstream GitHub Release, slots it

0 commit comments

Comments
 (0)