Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f4c40dd107 | |||
| 9247f13991 | |||
| 02fb5f1012 | |||
|
c9a31ba468
|
|||
| 4a3dc17dc9 | |||
|
17e1bfae50
|
|||
| aa4707da6a | |||
| d8714c8917 | |||
| 8344a203c2 | |||
| 4f092a980f | |||
| 6c6d626890 | |||
| 97e47f3ffe | |||
| 0bc4250f39 | |||
| dcf58084cd | |||
| e37bcb66ab |
@@ -2,7 +2,14 @@ name: Bump
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 5 * * *'
|
||||
workflow_dispatch: {}
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: >-
|
||||
Upstream gitea/runner version to bump to (e.g. 3.4.0, no leading
|
||||
"v"). Leave empty to use the latest upstream release.
|
||||
required: false
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
bump:
|
||||
@@ -19,7 +26,14 @@ jobs:
|
||||
id: check
|
||||
env:
|
||||
BUMP_TOKEN: ${{ secrets.BUMP_TOKEN }}
|
||||
BUMP_VERSION: ${{ inputs.version }}
|
||||
run: |
|
||||
# An explicitly requested version always runs the full bump.
|
||||
if [ -n "${BUMP_VERSION}" ]; then
|
||||
echo "needed=true" >> "$GITHUB_OUTPUT"
|
||||
echo "explicit version requested: ${BUMP_VERSION}"
|
||||
exit 0
|
||||
fi
|
||||
latest=$(wget -qO- https://gitea.com/gitea/runner/releases.rss \
|
||||
| grep -oE '<title>v[0-9]+\.[0-9]+\.[0-9]+</title>' \
|
||||
| head -1 | sed -E 's#</?title>##g; s/^v//')
|
||||
@@ -51,6 +65,12 @@ jobs:
|
||||
> /etc/portage/repos.conf/gentoo.conf
|
||||
sed -i '/^verify-signature/d' /etc/portage/binrepos.conf/gentoo.conf
|
||||
printf '\nverify-signature = false\n' >> /etc/portage/binrepos.conf/gentoo.conf
|
||||
# Upstream's go.mod can require a Go that Gentoo only has under
|
||||
# ~amd64 (GOTOOLCHAIN=local forbids auto-download), so accept the
|
||||
# testing-keyworded dev-lang/go. It is built from source when no
|
||||
# stable binpkg satisfies the requirement.
|
||||
mkdir -p /etc/portage/package.accept_keywords
|
||||
echo 'dev-lang/go ~amd64' > /etc/portage/package.accept_keywords/go
|
||||
emerge -q --getbinpkg \
|
||||
dev-vcs/git net-misc/curl app-arch/xz-utils app-misc/jq \
|
||||
dev-lang/go dev-util/pkgdev
|
||||
@@ -59,6 +79,7 @@ jobs:
|
||||
if: steps.check.outputs.needed == 'true'
|
||||
env:
|
||||
BUMP_TOKEN: ${{ secrets.BUMP_TOKEN }}
|
||||
BUMP_VERSION: ${{ inputs.version }}
|
||||
run: |
|
||||
host=${GITHUB_SERVER_URL#http://}; host=${host#https://}
|
||||
curl -fsSL "http://x-access-token:${BUMP_TOKEN}@${host}/${GITHUB_REPOSITORY}/raw/branch/master/scripts/bump-version.sh" \
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
name: CI
|
||||
on: [push]
|
||||
# Restrict to branch pushes: an unfiltered `push` also fires for tag refs,
|
||||
# including the vendor-release tags the bump script creates via the API.
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- '**'
|
||||
|
||||
jobs:
|
||||
# Lint gate: runs on the plain Docker-backend runner (not the Gentoo
|
||||
@@ -81,6 +86,11 @@ jobs:
|
||||
> /etc/portage/repos.conf/azy5030.conf
|
||||
mkdir -p /etc/portage/package.accept_keywords
|
||||
echo 'dev-util/gitea-runner ~amd64' > /etc/portage/package.accept_keywords/gitea-runner
|
||||
# Upstream tracks new Go releases faster than Gentoo stabilises them
|
||||
# (the ebuild's BDEPEND follows upstream go.mod), so accept the
|
||||
# testing-keyworded dev-lang/go. No stable binpkg exists for it, so
|
||||
# this compiles Go from source when a newer one is required.
|
||||
echo 'dev-lang/go ~amd64' > /etc/portage/package.accept_keywords/go
|
||||
|
||||
- name: QA scan
|
||||
run: pkgcheck scan --repo /var/db/repos/azy5030 dev-util/gitea-runner
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
name: Vendor tags
|
||||
# The bump script creates the `${PN}-${ver}-vendor` release (which hosts the
|
||||
# vendor tarball) *before* the bump commit exists, so its tag can only point at
|
||||
# whatever master was at the time. The PR is then squash/rebase-merged, so the
|
||||
# branch commit never lands on master either. This job re-points each vendor
|
||||
# tag at the master commit that introduced that version's ebuild. It is
|
||||
# idempotent: a tag already on the right commit is left alone.
|
||||
#
|
||||
# Only ever force-*update* a tag here. Deleting a release's tag makes Gitea
|
||||
# delete the release and its assets, which would break the ebuild's SRC_URI.
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
paths:
|
||||
- 'dev-util/**'
|
||||
|
||||
jobs:
|
||||
repoint:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Point vendor tags at their bump commits
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git fetch --tags --force origin
|
||||
for ebuild in dev-util/gitea-runner/gitea-runner-*.ebuild; do
|
||||
ver=${ebuild##*/gitea-runner-}; ver=${ver%.ebuild}
|
||||
tag="gitea-runner-${ver}-vendor"
|
||||
if ! cur=$(git rev-parse --verify -q "refs/tags/${tag}^{commit}"); then
|
||||
echo "${tag}: no such tag, skipping"; continue
|
||||
fi
|
||||
# git mv shows up as an addition of the new path (no --follow).
|
||||
target=$(git log --diff-filter=A --format=%H -1 -- "$ebuild")
|
||||
if [ "$cur" = "$target" ]; then
|
||||
echo "${tag}: already at ${target}"; continue
|
||||
fi
|
||||
echo "${tag}: ${cur} -> ${target}"
|
||||
git push --force origin "${target}:refs/tags/${tag}"
|
||||
done
|
||||
@@ -52,8 +52,9 @@ re-uploaded as a release asset, or the build will fail Manifest verification. Th
|
||||
4. `git mv`s the ebuild to the new version, rewrites `BDEPEND`'s Go version from
|
||||
upstream `go.mod`, and regenerates the Manifest with `pkgdev manifest` (after copying
|
||||
both distfiles into `/var/cache/distfiles` and wiring a temporary `repos.conf`).
|
||||
5. Validates: `pkgcheck scan`, then `emerge` + `gitea-runner --version | grep v${ver}`.
|
||||
6. Commits, pushes the branch, opens a PR against `master`.
|
||||
5. Commits, pushes the branch, opens a PR against `master`. The script does **not**
|
||||
emerge or pkgcheck the result itself: the branch push triggers CI, which does both
|
||||
(and fetches the real release asset, which the script's local copy never would).
|
||||
|
||||
Requires a `BUMP_TOKEN` repo secret (scopes: repository read/write, write release) plus
|
||||
a Gentoo env with `go pkgdev git curl xz jq`.
|
||||
@@ -74,6 +75,17 @@ runner executes JS actions by `docker exec node …` *inside* the job container,
|
||||
`gentoo/stage3` ships no node, so any JS action fails with exit 127. The lint job has no
|
||||
`container:`, so it runs in the runner's default node-capable image and checkout works.
|
||||
|
||||
## Vendor-tag repointing (`.gitea/workflows/vendor-tags.yaml`)
|
||||
|
||||
The bump script creates the `${PN}-${ver}-vendor` release before the bump commit
|
||||
exists, so its tag points at whatever `master` was at the time (and squash/rebase
|
||||
merges mean the branch commit never lands on `master` anyway). On every push to
|
||||
`master` touching `dev-util/**`, this workflow force-updates each vendor tag whose
|
||||
ebuild is still in the tree to the `master` commit that added that ebuild. It only
|
||||
ever *updates* tags: deleting a release's tag makes Gitea delete the release and its
|
||||
assets, breaking the ebuild's `SRC_URI`. Tag pushes don't re-trigger CI because
|
||||
`ci.yaml` is filtered to branch pushes.
|
||||
|
||||
## Conventions / gotchas
|
||||
|
||||
- **YAML** is linted by `.yamllint.yaml` (relaxed: line-length and document-start
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
DIST gitea-runner-3.0.0-vendor.tar.xz 3221008 BLAKE2B 98de6b01e06d5c6f797e9f9c4cad72a492c4fd50263d63fbb233384d5a6fdea8a44d3aee23145884c23ad4667445eb3b3960b382d6cac59c10f99f1ffa30abb8 SHA512 a63e24ca573bead0cc9a83dd09f04ec732004b6a0cfe6c9d578c09c41b50f3c74a9a6468d01526f1373b7bda037719c43157ba7e6d4608cb84dd8a6ecc6b4b39
|
||||
DIST gitea-runner-3.0.0.tar.gz 469896 BLAKE2B 32328f3a704bc26a5d5931cb221dce130ee03ef2117f91d31e84354f2a377e344a77e586e73b9e5cb5715d305ea4dc0bc49f6a4bb442aead51d29ebdab88f79a SHA512 7759ddde6a71cab0ac40499ef1d75825dca3aac0a5c76696e21b0d05f88e1b6b7cb6e2fb9e14efd64e462259520cf6dc0441d0dc9f7db98dd9fc70783629e0f3
|
||||
DIST gitea-runner-3.4.1-vendor.tar.xz 3278360 BLAKE2B f6bc131ffd37d4d2021d8eaba1d74f2926aece0a7cf4cd0326058282c39a28e3bfc08c4bbd26696b0c1764c12ddd68160260b0366bbcf280d1e82ba4190c6c16 SHA512 823bb450f2ee714e9514f8d0c5f70744dc5322d06d9dab09abcefa25fcc15826a02eb0b7608f382ff5922a96277f0182d3db22dd265deb1c7ccf57d0103665b1
|
||||
DIST gitea-runner-3.4.1.tar.gz 501146 BLAKE2B dfc0e60d745128847903de4727ee23688e06495aca44d3baf7f3ab51765ebf4e3db239e7a66846bac24069900718f60b71bf7b3597e4c471c684076c6fdef098 SHA512 adbfe811d322ceaecacae0a6c810297541bb137dc5fbd44dbddbb4e79da288e2ee0d6b59fd168fd37ecca486daea471821990fe9685200130b320c9a2279b2d1
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ LICENSE="MIT Apache-2.0 BSD BSD-2 ISC MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
BDEPEND=">=dev-lang/go-1.26.0"
|
||||
BDEPEND=">=dev-lang/go-1.27"
|
||||
# The runner shells out to the docker client for the Docker backend.
|
||||
RDEPEND="app-containers/docker-cli"
|
||||
|
||||
+28
-11
@@ -6,12 +6,17 @@
|
||||
# Expects a Gentoo environment with: go, pkgdev, git, curl, xz, jq.
|
||||
# Required env: BUMP_TOKEN, GITHUB_SERVER_URL, GITHUB_REPOSITORY.
|
||||
# Optional env: GITHUB_API_URL (defaults to ${GITHUB_SERVER_URL}/api/v1).
|
||||
# BUMP_VERSION target a specific upstream version (X.Y.Z, no
|
||||
# leading "v") instead of the latest release. An
|
||||
# explicit target may be older than the current
|
||||
# ebuild (useful to back out of a broken release).
|
||||
set -euo pipefail
|
||||
|
||||
PN="gitea-runner"
|
||||
UPSTREAM_RSS="https://gitea.com/gitea/runner/releases.rss"
|
||||
UPSTREAM_ARCHIVE="https://gitea.com/api/v1/repos/gitea/runner/archive"
|
||||
UPSTREAM_GOMOD="https://gitea.com/api/v1/repos/gitea/runner/raw/go.mod"
|
||||
UPSTREAM_TAGS="https://gitea.com/api/v1/repos/gitea/runner/tags"
|
||||
|
||||
: "${BUMP_TOKEN:?BUMP_TOKEN is required}"
|
||||
: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
|
||||
@@ -25,10 +30,22 @@ host="${GITHUB_SERVER_URL#*://}"
|
||||
api() { curl -fsSL -H "Authorization: token ${BUMP_TOKEN}" "$@"; }
|
||||
|
||||
# --- determine versions ------------------------------------------------------
|
||||
if [ -n "${BUMP_VERSION:-}" ]; then
|
||||
latest="${BUMP_VERSION#v}"
|
||||
echo "$latest" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$' \
|
||||
|| { echo "BUMP_VERSION must look like X.Y.Z (got '${BUMP_VERSION}')"; exit 1; }
|
||||
# Fail fast if the tag doesn't exist upstream, before cloning anything.
|
||||
# (The raw endpoint silently falls back to the default branch for an
|
||||
# unknown ref, so ask the tags API, which 404s.)
|
||||
curl -fsSL "${UPSTREAM_TAGS}/v${latest}" -o /dev/null \
|
||||
|| { echo "upstream tag v${latest} not found"; exit 1; }
|
||||
echo "targeting explicit version ${latest}"
|
||||
else
|
||||
latest=$(curl -fsSL "$UPSTREAM_RSS" \
|
||||
| grep -oE '<title>v[0-9]+\.[0-9]+\.[0-9]+</title>' \
|
||||
| head -1 | sed -E 's#</?title>##g; s/^v//')
|
||||
[ -n "$latest" ] || { echo "could not parse upstream version"; exit 1; }
|
||||
fi
|
||||
|
||||
WORK=$(mktemp -d)
|
||||
git clone "${scheme}://x-access-token:${BUMP_TOKEN}@${host}/${GITHUB_REPOSITORY}.git" "$WORK"
|
||||
@@ -39,11 +56,15 @@ current=$(find "$pkgdir" -name "${PN}-*.ebuild" \
|
||||
| sed -E "s#.*/${PN}-(.*)\.ebuild#\1#" | sort -V | tail -1)
|
||||
echo "upstream=${latest} current=${current}"
|
||||
|
||||
[ "$latest" != "$current" ] || { echo "already at ${latest}"; exit 0; }
|
||||
newest=$(printf '%s\n%s\n' "$current" "$latest" | sort -V | tail -1)
|
||||
if [ "$newest" = "$current" ] && [ "$latest" != "$current" ]; then
|
||||
if [ "$newest" = "$current" ]; then
|
||||
if [ -n "${BUMP_VERSION:-}" ]; then
|
||||
echo "warning: explicit target ${latest} is older than current ${current}; downgrading"
|
||||
else
|
||||
echo "current ($current) is newer than upstream ($latest); nothing to do"; exit 0
|
||||
fi
|
||||
[ "$latest" != "$current" ] || { echo "already at latest ($current)"; exit 0; }
|
||||
fi
|
||||
|
||||
branch="bump/${PN}-${latest}"
|
||||
if api "${API}/repos/${GITHUB_REPOSITORY}/branches/${branch}" >/dev/null 2>&1; then
|
||||
@@ -99,13 +120,10 @@ printf '[azy5030]\nlocation = %s\nmasters = gentoo\nauto-sync = false\n' "$WORK"
|
||||
> /etc/portage/repos.conf/azy5030.conf
|
||||
( cd "${pkgdir}" && pkgdev manifest )
|
||||
|
||||
# --- validate, commit, push, open PR ----------------------------------------
|
||||
pkgcheck scan --repo "$WORK" "${pkgdir}" || true
|
||||
mkdir -p /etc/portage/package.accept_keywords
|
||||
echo 'dev-util/gitea-runner ~amd64' > /etc/portage/package.accept_keywords/gitea-runner
|
||||
emerge -v --getbinpkg "=dev-util/${PN}-${latest}"
|
||||
gitea-runner --version | grep -q "v${latest}"
|
||||
|
||||
# --- commit, push, open PR ---------------------------------------------------
|
||||
# No emerge/pkgcheck here: pushing the branch triggers CI, which runs pkgcheck,
|
||||
# builds the package from the Manifest (fetching the real release asset) and
|
||||
# asserts `gitea-runner --version`. A broken release shows up as a red PR.
|
||||
git add -A
|
||||
git commit -m "dev-util/${PN}: bump to ${latest}"
|
||||
git push origin "$branch"
|
||||
@@ -120,8 +138,7 @@ Review checklist:
|
||||
- [ ] LICENSE still covers all vendored module licenses (\`go-licenses report ./...\`)
|
||||
- [ ] BDEPEND Go version matches upstream go.mod (set to >=${goreq:-unchanged})
|
||||
- [ ] version ldflags path \`internal/pkg/ver.version\` unchanged upstream
|
||||
|
||||
CI build + \`gitea-runner --version\` passed in this workflow.
|
||||
- [ ] CI (pkgcheck + emerge + \`gitea-runner --version\`) is green on this PR
|
||||
EOF
|
||||
)
|
||||
api -X POST -H 'Content-Type: application/json' \
|
||||
|
||||
Reference in New Issue
Block a user