Skip to content

Commit b284474

Browse files
authored
compile RPMs with fedora:latest (#38)
1 parent 659cb94 commit b284474

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

.github/workflows/tests.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,12 @@ jobs:
111111
name: Publish RPMs
112112
runs-on: ubuntu-latest
113113
container:
114-
image: rockylinux/rockylinux:9
114+
image: fedora:latest
115115
options: --privileged
116-
strategy:
117-
fail-fast: false
118-
matrix:
119-
include:
120-
- target: rocky+epel-8-x86_64
121-
arch: x86_64
122-
dist: el8
123-
- target: rocky+epel-9-x86_64
124-
arch: x86_64
125-
dist: el9
126116
steps:
127117
- name: Prepare mock and rpm-build
128118
run: |
129-
dnf -y install epel-release
130-
dnf -y install git make mock rpm-build
131-
echo "config_opts['print_main_output'] = True" >>/etc/mock/site-defaults.cfg
119+
dnf -y install asciidoc git golang make rpm-build
132120
133121
- name: Checkout code
134122
uses: actions/checkout@v4
@@ -141,13 +129,16 @@ jobs:
141129
make source-archive
142130
143131
- name: Build RPMs
144-
run: mock -r ${{ matrix.target }} --rebuild --spec=misc/sshproxy.spec --sources=.
132+
run: |
133+
mkdir -p ~/rpmbuild/SOURCES
134+
mv sshproxy-*.tar.gz ~/rpmbuild/SOURCES/
135+
rpmbuild -ba misc/sshproxy.spec
145136
146137
- name: Attach RPM and SRPM to release
147138
uses: xresloader/upload-to-github-release@v1
148139
env:
149140
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150141
with:
151-
file: "/var/lib/mock/${{ matrix.target }}/result/sshproxy-*.rpm"
142+
file: "/github/home/rpmbuild/RPMS/x86_64/*.rpm;/github/home/rpmbuild/SRPMS/*.rpm"
152143
tags: true
153144
draft: true

test/fedora-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:41
1+
FROM fedora:latest
22

33
# Install development environment to compile RPM
44
RUN set -ex \

0 commit comments

Comments
 (0)