Revert "Simplify workflow: single job loop over changed specs"
This reverts commit 80b2b48515.
This commit is contained in:
parent
05dc5dfe72
commit
f11a33cad0
1 changed files with 86 additions and 49 deletions
|
|
@ -7,75 +7,112 @@ on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
changed:
|
||||||
runs-on: almalinux-10
|
runs-on: almalinux-10
|
||||||
|
outputs:
|
||||||
|
matrix: ${{ steps.set.outputs.matrix }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Determine changed specs
|
- name: Determine changed specs
|
||||||
id: changed
|
id: set
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
||||||
SPECS="sonic-interface-libraries.spec sonic-win.spec sonic-workspace.spec"
|
python3 -c "import json; print(json.dumps({'spec': ['sonic-interface-libraries.spec','sonic-win.spec','sonic-workspace.spec']}))"
|
||||||
else
|
else
|
||||||
SPECS=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep '\.spec$' || true)
|
CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep '\.spec$' || true)
|
||||||
fi
|
python3 -c "import json, sys; print(json.dumps({'spec': sys.argv[1].split()}))" "$CHANGED"
|
||||||
echo "specs=$SPECS" >> "$GITHUB_OUTPUT"
|
fi >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
build:
|
||||||
|
needs: changed
|
||||||
|
runs-on: almalinux-10
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix: ${{ fromJSON(needs.changed.outputs.matrix) }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install build tools
|
- name: Install build tools
|
||||||
run: |
|
run: |
|
||||||
dnf install -y rpm-build rpmdevtools mock curl
|
dnf install -y \
|
||||||
usermod -aG mock $(whoami) || true
|
rpm-build \
|
||||||
|
rpmdevtools \
|
||||||
|
mock \
|
||||||
|
curl
|
||||||
|
|
||||||
|
- name: Add runner user to mock group
|
||||||
|
run: usermod -aG mock $(whoami) || true
|
||||||
|
|
||||||
- name: Setup RPM build tree
|
- name: Setup RPM build tree
|
||||||
run: rpmdev-setuptree
|
run: rpmdev-setuptree
|
||||||
|
|
||||||
- name: Build changed specs
|
- name: Download sources for ${{ matrix.spec }}
|
||||||
|
run: |
|
||||||
|
spectool -g -C ~/rpmbuild/SOURCES/ ${{ matrix.spec }}
|
||||||
|
|
||||||
|
- name: Build SRPM from ${{ matrix.spec }}
|
||||||
|
run: |
|
||||||
|
rpmbuild -bs \
|
||||||
|
--define "_topdir ${HOME}/rpmbuild" \
|
||||||
|
--define "_disable_source_fetch 0" \
|
||||||
|
${{ matrix.spec }}
|
||||||
|
PKGNAME=$(rpmspec -q --srpm --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.src.rpm" ${{ matrix.spec }})
|
||||||
|
echo "SRPM_PATH=${HOME}/rpmbuild/SRPMS/${PKGNAME}" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Build RPM with mock
|
||||||
|
run: |
|
||||||
|
cat > /tmp/mock-custom.cfg <<'MOCKEOF'
|
||||||
|
include('/etc/mock/alma+epel-10-x86_64.cfg')
|
||||||
|
config_opts['root'] = 'custom'
|
||||||
|
config_opts['yum.conf'] += """
|
||||||
|
[sonicde-rpm]
|
||||||
|
name=SonicDE RPM
|
||||||
|
baseurl=https://pc-rytteren.dk/forge/api/packages/anders/rpm
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[xlibre-xserver]
|
||||||
|
name=Copr xlibre-xserver
|
||||||
|
baseurl=https://download.copr.fedorainfracloud.org/results/@xlibre/xlibre-xserver/rhel+epel-10-$basearch/
|
||||||
|
type=rpm-md
|
||||||
|
skip_if_unavailable=True
|
||||||
|
gpgcheck=1
|
||||||
|
gpgkey=https://download.copr.fedorainfracloud.org/results/@xlibre/xlibre-xserver/pubkey.gpg
|
||||||
|
repo_gpgcheck=0
|
||||||
|
enabled=1
|
||||||
|
"""
|
||||||
|
MOCKEOF
|
||||||
|
cp /tmp/mock-custom.cfg /etc/mock/custom.cfg
|
||||||
|
mock --root custom --scrub=chroot || true
|
||||||
|
mock \
|
||||||
|
--root custom \
|
||||||
|
--resultdir "${HOME}/mock-results" \
|
||||||
|
--clean \
|
||||||
|
--rebuild "${{ env.SRPM_PATH }}"
|
||||||
|
|
||||||
|
- name: Upload RPMs to Forgejo Package Registry
|
||||||
run: |
|
run: |
|
||||||
FORGEJO_URL="${{ github.server_url }}"
|
FORGEJO_URL="${{ github.server_url }}"
|
||||||
OWNER="${{ github.repository_owner }}"
|
OWNER="${{ github.repository_owner }}"
|
||||||
TOKEN="${{ secrets.PACKAGE_TOKEN }}"
|
TOKEN="${{ secrets.PACKAGE_TOKEN }}"
|
||||||
|
|
||||||
for spec in ${{ steps.changed.outputs.specs }}; do
|
find "${HOME}/mock-results" -name "*.rpm" ! -name "*.src.rpm" | while read rpm; do
|
||||||
echo "=== Building $spec ==="
|
FILENAME=$(basename "$rpm")
|
||||||
spectool -g -C ~/rpmbuild/SOURCES/ "$spec"
|
echo "Uploading $FILENAME ..."
|
||||||
rpmbuild -bs --define "_topdir ${HOME}/rpmbuild" --define "_disable_source_fetch 0" "$spec"
|
curl --fail-with-body \
|
||||||
PKGNAME=$(rpmspec -q --srpm --queryformat "%{NAME}-%{VERSION}-%{RELEASE}.src.rpm" "$spec")
|
--user "${OWNER}:${TOKEN}" \
|
||||||
SRPM="${HOME}/rpmbuild/SRPMS/${PKGNAME}"
|
--upload-file "$rpm" \
|
||||||
|
"${FORGEJO_URL}/api/packages/${OWNER}/rpm/upload"
|
||||||
cat > /tmp/mock-custom.cfg <<'MOCKEOF'
|
|
||||||
include('/etc/mock/alma+epel-10-x86_64.cfg')
|
|
||||||
config_opts['root'] = 'custom'
|
|
||||||
config_opts['yum.conf'] += """
|
|
||||||
[sonicde-rpm]
|
|
||||||
name=SonicDE RPM
|
|
||||||
baseurl=https://pc-rytteren.dk/forge/api/packages/anders/rpm
|
|
||||||
enabled=1
|
|
||||||
gpgcheck=0
|
|
||||||
|
|
||||||
[xlibre-xserver]
|
|
||||||
name=Copr xlibre-xserver
|
|
||||||
baseurl=https://download.copr.fedorainfracloud.org/results/@xlibre/xlibre-xserver/rhel+epel-10-$basearch/
|
|
||||||
type=rpm-md
|
|
||||||
skip_if_unavailable=True
|
|
||||||
gpgcheck=1
|
|
||||||
gpgkey=https://download.copr.fedorainfracloud.org/results/@xlibre/xlibre-xserver/pubkey.gpg
|
|
||||||
repo_gpgcheck=0
|
|
||||||
enabled=1
|
|
||||||
"""
|
|
||||||
MOCKEOF
|
|
||||||
cp /tmp/mock-custom.cfg /etc/mock/custom.cfg
|
|
||||||
mock --root custom --scrub=chroot || true
|
|
||||||
mock --root custom --resultdir "${HOME}/mock-results" --clean --rebuild "$SRPM"
|
|
||||||
|
|
||||||
find "${HOME}/mock-results" -name "*.rpm" ! -name "*.src.rpm" | while read rpm; do
|
|
||||||
FILENAME=$(basename "$rpm")
|
|
||||||
echo "Uploading $FILENAME ..."
|
|
||||||
curl --fail-with-body --user "${OWNER}:${TOKEN}" --upload-file "$rpm" "${FORGEJO_URL}/api/packages/${OWNER}/rpm/upload"
|
|
||||||
done
|
|
||||||
|
|
||||||
rm -rf "${HOME}/mock-results"
|
|
||||||
rm -rf "${HOME}/rpmbuild/SRPMS"
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: Clean up build artifacts
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
rm -rf "${HOME}/mock-results"
|
||||||
|
rm -rf "${HOME}/rpmbuild/SRPMS"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue