From 4a9a4fc77532fd61f9645940f6b4f20ac3520dbe Mon Sep 17 00:00:00 2001 From: rob thijssen Date: Thu, 16 Apr 2026 12:34:39 +0300 Subject: [PATCH] ci: migrate copr publish to reusable action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the in-repo .gitea/scripts/copr-build.sh and per-job copr-cli configuration with the shared composite action at https://git.lair.cafe/actions/copr-publish@v1. Behaviour is identical — submit, watch, dump per-chroot logs — but the logic now lives in a single place that other projects can consume. Removes the actions/checkout step from both COPR jobs since the build script is no longer local to this repo. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/scripts/copr-build.sh | 61 ------------------------------------ .gitea/workflows/ci.yml | 30 +++++++----------- 2 files changed, 12 insertions(+), 79 deletions(-) delete mode 100755 .gitea/scripts/copr-build.sh diff --git a/.gitea/scripts/copr-build.sh b/.gitea/scripts/copr-build.sh deleted file mode 100755 index 2cc1fdc..0000000 --- a/.gitea/scripts/copr-build.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# Submit an SRPM to COPR, watch the build, and dump per-chroot build logs -# to stdout so they are captured in CI output. -# -# Usage: copr-build.sh [srpm...] -# Example: copr-build.sh helexa/cortex ./cortex-0.1.2-1.fc43.src.rpm - -set -o pipefail - -PROJECT="$1" -shift - -if [ -z "$PROJECT" ] || [ "$#" -eq 0 ]; then - echo "usage: $0 [srpm...]" >&2 - exit 2 -fi - -# Submit without waiting; capture the build ID from stdout. -SUBMIT_OUT=$(copr-cli build --nowait "$PROJECT" "$@") -echo "$SUBMIT_OUT" -BUILD_ID=$(echo "$SUBMIT_OUT" | grep -oP 'Created builds: \K[0-9]+' | head -n1) - -if [ -z "$BUILD_ID" ]; then - echo "error: could not parse build ID from copr-cli output" >&2 - exit 1 -fi - -echo -echo "Build $BUILD_ID submitted to $PROJECT" -echo "Follow live: https://copr.fedorainfracloud.org/coprs/build/$BUILD_ID" -echo - -# Watch the build; captures status transitions to stdout. Exit non-zero -# on build failure, but defer propagating that until after we've fetched -# logs so the CI output contains diagnostics either way. -if copr-cli watch-build "$BUILD_ID"; then - STATUS=0 -else - STATUS=$? -fi - -# Fetch per-chroot results (logs + rpms). Anonymous download — no auth needed. -mkdir -p copr-logs -copr-cli download-build --dest copr-logs "$BUILD_ID" || { - echo "warning: failed to download build artifacts" >&2 -} - -# Dump each chroot's builder-live.log as a collapsible group. -for chroot_dir in copr-logs/*/; do - [ -d "$chroot_dir" ] || continue - chroot=$(basename "$chroot_dir") - log="${chroot_dir}builder-live.log" - if [ -f "$log" ]; then - echo - echo "::group::${chroot} builder-live.log" - cat "$log" - echo "::endgroup::" - fi -done - -exit "$STATUS" diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 1a03f72..008e97b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -168,40 +168,34 @@ jobs: runs-on: fedora needs: srpm-cortex steps: - - uses: actions/checkout@v4 - - name: Download SRPM uses: actions/download-artifact@v3 with: name: srpm-cortex - - name: Configure copr-cli - run: | - mkdir -p ~/.config - echo "${{ secrets.COPR_CONFIG }}" > ~/.config/copr - - - name: Submit build to COPR - run: bash .gitea/scripts/copr-build.sh helexa/cortex *.src.rpm + - name: Publish to COPR + uses: https://git.lair.cafe/actions/copr-publish@v1 + with: + project: helexa/cortex + srpm: "*.src.rpm" + copr-config: ${{ secrets.COPR_CONFIG }} copr-neuron: name: Publish neuron to COPR runs-on: fedora needs: srpm-neuron steps: - - uses: actions/checkout@v4 - - name: Download SRPM uses: actions/download-artifact@v3 with: name: srpm-neuron - - name: Configure copr-cli - run: | - mkdir -p ~/.config - echo "${{ secrets.COPR_CONFIG }}" > ~/.config/copr - - - name: Submit build to COPR - run: bash .gitea/scripts/copr-build.sh helexa/neuron *.src.rpm + - name: Publish to COPR + uses: https://git.lair.cafe/actions/copr-publish@v1 + with: + project: helexa/neuron + srpm: "*.src.rpm" + copr-config: ${{ secrets.COPR_CONFIG }} bump-version: name: Bump version in source