From f7e5b1e32469592b39d634d64a8c282efd0a3dd9 Mon Sep 17 00:00:00 2001 From: Anders da Silva Rytter Hansen Date: Wed, 27 May 2026 12:19:07 -0300 Subject: [PATCH] use mock instead --- .forgejo/workflows/build-rpms.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.forgejo/workflows/build-rpms.yml b/.forgejo/workflows/build-rpms.yml index c1e7543..67f349f 100644 --- a/.forgejo/workflows/build-rpms.yml +++ b/.forgejo/workflows/build-rpms.yml @@ -26,33 +26,41 @@ jobs: dnf install -y \ rpm-build \ rpmdevtools \ - dnf-plugins-core \ + mock \ curl + - name: Add runner user to mock group + run: usermod -aG mock $(whoami) || true + - name: Setup RPM build tree run: rpmdev-setuptree - - name: Install build dependencies for ${{ matrix.spec }} - run: | - dnf builddep -y ${{ matrix.spec }} - - name: Download sources for ${{ matrix.spec }} run: | - spectool -g -R ${{ matrix.spec }} + spectool -g -C ~/rpmbuild/SOURCES/ ${{ matrix.spec }} - - name: Build RPM from ${{ matrix.spec }} + - name: Build SRPM from ${{ matrix.spec }} run: | - rpmbuild -ba \ + rpmbuild -bs \ --define "_topdir ${HOME}/rpmbuild" \ + --define "_disable_source_fetch 0" \ ${{ matrix.spec }} + - name: Build RPM with mock + run: | + SRPM=$(find "${HOME}/rpmbuild/SRPMS" -name "*.src.rpm" | head -1) + mock \ + --root almalinux-10-x86_64 \ + --resultdir "${HOME}/mock-results" \ + --rebuild "$SRPM" + - name: Upload RPMs to Forgejo Package Registry run: | - FORGEJO_URL="${{ env.GITHUB_SERVER_URL }}" + FORGEJO_URL="${{ github.server_url }}" OWNER="${{ github.repository_owner }}" TOKEN="${{ secrets.PACKAGE_TOKEN }}" - find "${HOME}/rpmbuild/RPMS" -name "*.rpm" | while read rpm; do + find "${HOME}/mock-results" -name "*.rpm" ! -name "*.src.rpm" | while read rpm; do FILENAME=$(basename "$rpm") echo "Uploading $FILENAME ..." curl --fail-with-body \