From 778165394125274c5961a2bce38e369deab0fff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Schl=C3=B6ffel?= Date: Sun, 12 Jul 2026 08:05:55 +0200 Subject: [PATCH] Use repository owner as CI packager --- .gitea/workflows/build.yml | 2 +- README.md | 7 +++++++ scripts/apk/build.sh | 2 +- scripts/apk/ci-build.sh | 2 +- scripts/apk/container-entrypoint.sh | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 758a45a..d0d4b64 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -31,7 +31,7 @@ jobs: PACKAGE_OWNER: "${{ vars.PACKAGE_OWNER }}" PACKAGE_USER: "${{ secrets.PACKAGE_USER }}" PACKAGE_TOKEN: "${{ secrets.PACKAGE_TOKEN }}" - PACKAGER: "Joachim Schlöffel " + PACKAGER: "${{ gitea.repository_owner }}" ALPINE_APK_REPO_CACHE: "/cache/public-alpine-packages/${{ matrix.alpine_registry_branch }}/apk-repo" CARGO_HOME: "/cache/public-alpine-packages/${{ matrix.alpine_registry_branch }}/greptimedb/cargo" RUSTUP_HOME: "/cache/public-alpine-packages/${{ matrix.alpine_registry_branch }}/greptimedb/rustup" diff --git a/README.md b/README.md index e0889da..27e8bf1 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,13 @@ ALPINE_APK_CACHE_SCOPE=public-alpine-packages ALPINE_PACKAGE=greptimedb mise run ALPINE_APK_CACHE_PREFIX=alpine-apk-ci ALPINE_PACKAGE=greptimedb mise run apk:build ``` +Local packages use `local` as the default package metadata identity. Override it +when needed: + +```sh +PACKAGER="Example Builder " ALPINE_PACKAGE=seaweedfs mise run apk:build +``` + Open an Alpine package build shell: ```sh diff --git a/scripts/apk/build.sh b/scripts/apk/build.sh index e01f862..bea6f78 100755 --- a/scripts/apk/build.sh +++ b/scripts/apk/build.sh @@ -98,7 +98,7 @@ run_for_arch() { -e "APKBUILD_DIR=${container_package_dir}" \ -e "CARGO_HOME=/home/builder/.cache/cargo" \ -e "CARGO_TARGET_DIR=/home/builder/.cache/cargo-target" \ - -e "PACKAGER=${PACKAGER:-Joachim Schlöffel }" \ + -e "PACKAGER=${PACKAGER:-local}" \ -e "RUSTUP_HOME=/home/builder/.cache/rustup" \ -v "${cache_prefix}-cargo:/home/builder/.cache/cargo" \ -v "${cache_prefix}-cargo-target:/home/builder/.cache/cargo-target" \ diff --git a/scripts/apk/ci-build.sh b/scripts/apk/ci-build.sh index 1833f17..642e6ff 100755 --- a/scripts/apk/ci-build.sh +++ b/scripts/apk/ci-build.sh @@ -7,7 +7,7 @@ repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" repo_name="${ALPINE_REPO_NAME:-local}" arches="${ALPINE_ARCHES:-x86_64 aarch64}" -packager="${PACKAGER:-Joachim Schlöffel }" +packager="${PACKAGER:-local}" selected_packages="${ALPINE_PACKAGE:-${ALPINE_PACKAGES:-}}" skip_build="${ALPINE_SKIP_BUILD:-0}" diff --git a/scripts/apk/container-entrypoint.sh b/scripts/apk/container-entrypoint.sh index 979cf08..4c0bdaf 100755 --- a/scripts/apk/container-entrypoint.sh +++ b/scripts/apk/container-entrypoint.sh @@ -7,7 +7,7 @@ repo_name="${ALPINE_REPO_NAME:-local}" arch="${ALPINE_ARCH:-x86_64}" export CARCH="${CARCH:-$arch}" -export PACKAGER="${PACKAGER:-Joachim Schlöffel }" +export PACKAGER="${PACKAGER:-local}" if [[ -n "${PACKAGER_PRIVKEY:-}" ]]; then export PACKAGER_PRIVKEY fi