From e173b4ee2e6607b8ff82da558e60863fccc5e2f0 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 8 Jan 2025 17:54:36 -0500 Subject: [PATCH] wip --- .copr/Makefile | 2 +- .github/workflows/rpm.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.copr/Makefile b/.copr/Makefile index 2e34dfaf..212f00b6 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -14,4 +14,4 @@ srpm: sed -ie 's/^Source1/# Source1/g' rust-afterburn.spec # we don't vendor spectool -g rust-afterburn.spec # download any remaining sources (e.g. coreos-installer-dracut) rpmbuild -bs --define "_sourcedir ${PWD}" --define "_specdir ${PWD}" --define "_builddir ${PWD}" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" --define "_buildrootdir ${PWD}/.build" rust-afterburn.spec - mv *.src.rpm $$outdir + mv *.src.rpm $outdir diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml index f33ada4c..2cec86e4 100644 --- a/.github/workflows/rpm.yml +++ b/.github/workflows/rpm.yml @@ -25,22 +25,22 @@ jobs: steps: # need to install git before checkout to get a git repo - name: Install packages - run: dnf install -y git make mock + run: dnf5 install -y git make mock - name: Check out repository uses: actions/checkout@v4 # fetch tags for versioning with: - fetch-depth: 0 + fetch-depth: 1 # https://github.com/actions/checkout/issues/766 - name: Mark git checkout as safe run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Check RPM version - run: rpm --version - name: Build RPMs run: | + curl -o /etc/yum.repos.d/fedora-updates-archive.repo https://src.fedoraproject.org/rpms/fedora-repos/raw/rawhide/f/fedora-updates-archive.repo + dnf install -y glibc-2.40-14.fc41 mkdir rpms make -f .copr/Makefile srpm outdir=rpms - mock --rebuild --enablerepo=updates-testing rpms/*.src.rpm + sudo /usr/libexec/mock/mock --rebuild --enablerepo=updates-testing rpms/*.src.rpm find /var/lib/mock -wholename '*/result/*.rpm' | xargs mv -t rpms - name: Archive RPMs uses: actions/upload-artifact@v4