Skip to content

Commit 4848854

Browse files
committed
Add Fedora 43 SRPM
That doesn't include PLATFORM_ID in its /etc/os-release any more. Put RHEL in the first case and fall through. Then just need to test centos as an if condition.
1 parent 71967fc commit 4848854

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/build-srpm.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ jobs:
3636
tag: fedora42-srpm
3737
platforms: linux/amd64, linux/arm64/v8
3838

39+
- dockerfile: srpm.Dockerfile
40+
image: fedora:43
41+
tag: fedora43-srpm
42+
platforms: linux/amd64, linux/arm64/v8
43+
3944
- dockerfile: srpm.Dockerfile
4045
image: registry.access.redhat.com/ubi7
4146
tag: rhel7-srpm

ci_build_images/srpm.Dockerfile

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ LABEL maintainer="MariaDB Buildbot maintainers"
1010
# REPOSITORY AND RPM TOOLS SETUP
1111
# hadolint ignore=SC2086
1212
RUN source /etc/os-release \
13-
&& case $PLATFORM_ID in \
14-
"platform:el8"|"platform:el9"|"platform:el10"|"platform:f41"|"platform:f42") \
13+
&& case "$ID:$VERSION_ID" in \
14+
rhel:8*|rhel:9*|rhel:1*) \
15+
# crb in rhel is enabled with a valid subscription, will be handled by running the container in an RH host
16+
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-${PLATFORM_ID##*:el}.noarch.rpm; \
17+
# fall through
18+
;& \
19+
centos:*|fedora:*) \
1520
dnf -y upgrade \
1621
&& dnf -y install rpm-build yum-utils wget which perl-generators sudo gcc-c++; \
17-
case $ID in \
18-
"rhel") \
19-
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-${PLATFORM_ID##*:el}.noarch.rpm; \
20-
# crb in rhel is enabled with a valid subscription, will be handled by running the container in an RH host
21-
;; \
22-
"centos") \
23-
dnf -y install epel-release \
24-
&& dnf config-manager --set-enabled crb; \
25-
;; \
26-
esac; \
22+
if [ $ID = centos ]; then \
23+
dnf -y install epel-release \
24+
&& dnf config-manager --set-enabled crb; \
25+
fi; \
2726
dnf install -y ccache \
2827
&& dnf clean all; \
2928
;; \

0 commit comments

Comments
 (0)