Skip to content

Commit 1bb89cb

Browse files
authored
Fix RPM digest compatibility for Fedora 43 (#75)
* Fix RPM digest compatibility for Fedora 43 * Add PR workflow for RPM verification * Fix aarch64 RPM builder platform selection
1 parent 8b3e987 commit 1bb89cb

4 files changed

Lines changed: 176 additions & 6 deletions

File tree

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
FROM arm64v8/centos:7
2-
RUN yum install -y rpm-build redhat-rpm-config rpmdevtools
1+
FROM almalinux:9
2+
RUN dnf install -y rpm-build redhat-rpm-config rpmdevtools \
3+
&& dnf clean all
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
FROM centos:7
2-
RUN yum install -y rpm-build redhat-rpm-config rpmdevtools
1+
FROM almalinux:9
2+
RUN dnf install -y rpm-build redhat-rpm-config rpmdevtools \
3+
&& dnf clean all

.github/workflows/release.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ jobs:
163163
esac;
164164
165165
cat > "${RPM_BUILD}/SPECS/template.spec" <<EOF
166+
%global _binary_filedigest_algorithm 10
167+
%global _source_filedigest_algorithm 10
166168
Name: ${PROJECT_NAME}
167169
Summary: Masking tape to help commands "do one thing well"
168170
Version: ${PROJECT_VERSION}
@@ -209,8 +211,12 @@ jobs:
209211
210212
## Build
211213
sudo apt-get update && sudo apt-get install -y qemu-user-static
212-
docker build -t ${RPM_ARCH}-rpm-builder -f .github/dockerfiles/Dockerfile.${RPM_ARCH} .
213-
sudo docker run --rm -v "$PWD/$RPM_BUILD":/root/rpmbuild ${RPM_ARCH}-rpm-builder \
214+
DOCKER_PLATFORM=
215+
if [[ "${RPM_ARCH}" == "aarch64" ]]; then
216+
DOCKER_PLATFORM="--platform linux/arm64"
217+
fi
218+
docker build ${DOCKER_PLATFORM} -t ${RPM_ARCH}-rpm-builder -f .github/dockerfiles/Dockerfile.${RPM_ARCH} .
219+
sudo docker run ${DOCKER_PLATFORM} --rm -v "$PWD/$RPM_BUILD":/root/rpmbuild ${RPM_ARCH}-rpm-builder \
214220
rpmbuild --undefine=_disable_source_fetch -ba /root/rpmbuild/SPECS/template.spec
215221
216222
BIN_NAME="teip-${{ steps.vars.outputs.ver }}.${{ matrix.target }}.rpm"
@@ -220,6 +226,15 @@ jobs:
220226
echo "$( sha256sum "$BIN_NAME" | awk '{print $1}' )" > "${BIN_NAME}.sha256"
221227
sudo cp -l "${BIN_NAME}" "${BIN_NAME}.sha256" "${{ env.RELEASE_DIR }}"
222228
229+
- name: Verify rpm on Fedora 43
230+
if: matrix.ext == 'rpm'
231+
run: |
232+
BIN_NAME="teip-${{ steps.vars.outputs.ver }}.${{ matrix.target }}.rpm"
233+
sudo docker run --rm -v "$PWD":/work -w /work fedora:43 sh -lc '
234+
dnf install -y --nogpgcheck /work/'"$BIN_NAME"'
235+
rpm -Kv /work/'"$BIN_NAME"'
236+
'
237+
223238
- name: Create Debian package
224239
id: deb
225240
if: matrix.ext == 'deb'

.github/workflows/rpm-verify.yml

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
name: Verify RPM Packages
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
workflow_dispatch:
10+
11+
jobs:
12+
rpm-verify:
13+
name: rpm-${{ matrix.target }}
14+
runs-on: ubuntu-latest
15+
if: github.event_name != 'pull_request' || !contains(github.event.pull_request.title, '[skip ci]')
16+
env:
17+
LANG: en_US.UTF-8
18+
LC_ALL: en_US.UTF-8
19+
strategy:
20+
matrix:
21+
include:
22+
- target: x86_64-unknown-linux-musl
23+
rpm_arch: x86_64
24+
- target: aarch64-unknown-linux-musl
25+
rpm_arch: aarch64
26+
27+
steps:
28+
- uses: actions/checkout@v3
29+
30+
- name: Set envs
31+
run: |
32+
echo "PROJECT_VERSION=$(sed -n 's/^version = \"\(.*\)\"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV
33+
echo "PROJECT_NAME=$(sed -n 's/^name = \"\(.*\)\"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV
34+
echo "PROJECT_MAINTAINER=$(sed -n 's/^authors = \[\"\(.*\)\"\]/\1/p' Cargo.toml)" >> $GITHUB_ENV
35+
echo "PROJECT_HOMEPAGE=$(sed -n 's/^homepage = \"\(.*\)\"/\1/p' Cargo.toml)" >> $GITHUB_ENV
36+
37+
- name: Install prerequisites
38+
shell: bash
39+
run: |
40+
sudo apt-get -y update
41+
sudo apt-get -y install musl-tools qemu-user-static
42+
if [[ "${{ matrix.target }}" =~ ^aarch64-unknown-linux ]]; then
43+
sudo apt-get -y install gcc-aarch64-linux-gnu
44+
mkdir -p $HOME/.cargo
45+
echo "[target.aarch64-unknown-linux-musl]" >> $HOME/.cargo/config
46+
echo 'linker = "aarch64-linux-gnu-gcc"' >> $HOME/.cargo/config
47+
fi
48+
49+
- name: Build the release target
50+
shell: bash
51+
run: |
52+
rustup target add ${{ matrix.target }}
53+
case ${{ matrix.target }} in
54+
x86_64-unknown-linux-musl) CFLAGS="-fPIE" CC="musl-gcc -static" cargo build --verbose --features oniguruma --release --target ${{ matrix.target }} ;;
55+
aarch64-unknown-linux-musl) CC="aarch64-linux-gnu-gcc -specs /usr/lib/x86_64-linux-musl/musl-gcc.specs" cargo build --verbose --features oniguruma --release --target ${{ matrix.target }} ;;
56+
esac
57+
58+
- name: Pack files for RPM
59+
shell: bash
60+
run: |
61+
mkdir -p package/bin
62+
mkdir -p package/man
63+
mkdir -p package/doc
64+
cp README.md package/doc
65+
cp LICENSE package/doc
66+
cp target/${{ matrix.target }}/release/teip package/bin
67+
cp man/teip.1 package/man
68+
cp -r completion package/
69+
70+
- name: Build RPM
71+
shell: bash
72+
run: |
73+
RPM_BUILD=rpmbuild
74+
RPM_PACK=teip-${PROJECT_VERSION}
75+
BIN_NAME=teip-${PROJECT_VERSION}.${{ matrix.target }}.rpm
76+
77+
cp -al "package/" "${RPM_PACK}/"
78+
tar zcvf "${RPM_PACK}.tar.gz" -C "$PWD" "${RPM_PACK}"
79+
mkdir -p "${RPM_BUILD}/SOURCES"
80+
mkdir -p "${RPM_BUILD}/SPECS"
81+
cp "${RPM_PACK}.tar.gz" "${RPM_BUILD}/SOURCES"
82+
83+
cat > "${RPM_BUILD}/SPECS/template.spec" <<EOF
84+
%global _binary_filedigest_algorithm 10
85+
%global _source_filedigest_algorithm 10
86+
Name: ${PROJECT_NAME}
87+
Summary: Masking tape to help commands "do one thing well"
88+
Version: ${PROJECT_VERSION}
89+
Group: Applications
90+
License: MIT
91+
Release: 1
92+
BuildArch: ${{ matrix.rpm_arch }}
93+
URL: ${PROJECT_HOMEPAGE}
94+
Source: ${RPM_PACK}.tar.gz
95+
Vendor: Yasuhiro Yamada <yamada@gr3.ie>
96+
Provides: ${PROJECT_NAME}
97+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
98+
%description
99+
Masking tape to help commands "do one thing well"
100+
Bypassing a partial range of standard input to any command
101+
whatever you want
102+
%prep
103+
%setup
104+
%install
105+
install -d -m 0755 %{buildroot}%{_bindir}
106+
install -d -m 0755 %{buildroot}%{_mandir}/man1
107+
install -d -m 0755 %{buildroot}%{_docdir}/%{name}/
108+
install -d -m 0755 %{buildroot}%{_datadir}/zsh/site-functions
109+
install -d -m 0755 %{buildroot}%{_datadir}/fish/completions
110+
install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
111+
%{__cp} -a bin/* %{buildroot}%{_bindir}/
112+
%{__cp} -a man/*.1 %{buildroot}%{_mandir}/man1/
113+
%{__cp} -a doc/README.md %{buildroot}%{_docdir}/%{name}/
114+
%{__cp} -a doc/LICENSE %{buildroot}%{_docdir}/%{name}/
115+
%{__cp} -a completion/zsh/* %{buildroot}%{_datadir}/zsh/site-functions/
116+
%{__cp} -a completion/fish/* %{buildroot}%{_datadir}/fish/completions/
117+
%{__cp} -a completion/bash/* %{buildroot}%{_datadir}/bash-completion/completions/
118+
%files
119+
%attr(0644, root, root) %{_mandir}/man1/*
120+
%attr(0755, root, root) %{_bindir}/*
121+
%attr(0644, root, root) %{_datadir}/zsh/site-functions/*
122+
%attr(0644, root, root) %{_datadir}/fish/completions/*
123+
%attr(0644, root, root) %{_datadir}/bash-completion/completions/*
124+
%attr(0644, root, root) %doc %{_docdir}/%{name}/README.md
125+
%attr(0644, root, root) %doc %{_docdir}/%{name}/LICENSE
126+
%clean
127+
%{__rm} -rf %{buildroot}
128+
EOF
129+
130+
DOCKER_PLATFORM=
131+
if [[ "${{ matrix.rpm_arch }}" == "aarch64" ]]; then
132+
DOCKER_PLATFORM="--platform linux/arm64"
133+
fi
134+
docker build ${DOCKER_PLATFORM} -t ${{ matrix.rpm_arch }}-rpm-builder -f .github/dockerfiles/Dockerfile.${{ matrix.rpm_arch }} .
135+
sudo docker run ${DOCKER_PLATFORM} --rm -v "$PWD/$RPM_BUILD":/root/rpmbuild ${{ matrix.rpm_arch }}-rpm-builder \
136+
rpmbuild --undefine=_disable_source_fetch -ba /root/rpmbuild/SPECS/template.spec
137+
138+
sudo mv "$RPM_BUILD"/RPMS/"${{ matrix.rpm_arch }}"/teip-*.rpm "$BIN_NAME"
139+
echo "BIN_NAME=$BIN_NAME" >> $GITHUB_ENV
140+
141+
- name: Upload RPM artifact
142+
uses: actions/upload-artifact@v4
143+
with:
144+
name: rpm-${{ matrix.target }}
145+
path: ${{ env.BIN_NAME }}
146+
147+
- name: Verify RPM on Fedora 43
148+
shell: bash
149+
run: |
150+
sudo docker run --rm -v "$PWD":/work -w /work fedora:43 sh -lc '
151+
dnf install -y --nogpgcheck /work/'"$BIN_NAME"'
152+
rpm -Kv /work/'"$BIN_NAME"'
153+
'

0 commit comments

Comments
 (0)