Skip to content

Commit dc6935a

Browse files
--add-repo is now addrepo --from-repofile in fedora 41 or later
disable galera install in fedora40-valgrind to avoid an extra IF in fedora.Dockerfile will replace fedora40-valgrind anyway in a separate PR.
1 parent d61c319 commit dc6935a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/build-fedora-based.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
platforms: linux/amd64
3939
tag: fedora40-valgrind
4040
install_valgrind: "true"
41-
nogalera: false
41+
nogalera: true
4242

4343
uses: ./.github/workflows/bbw_build_container_template.yml
4444
with:

ci_build_images/fedora.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \
1515
&& . /etc/os-release \
1616
&& ARCH=$(rpm --query --queryformat='%{ARCH}' rpm) \
1717
&& if [ "$ARCH" = x86_64 ]; then ARCH=amd64 ; fi \
18-
&& dnf config-manager --add-repo https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}"-fedora-"${VERSION_ID}".repo \
18+
&& dnf config-manager addrepo --from-repofile https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-"${ARCH}"-fedora-"${VERSION_ID}".repo \
1919
&& dnf -y builddep mariadb-server \
2020
&& dnf -y install \
2121
@development-tools \

0 commit comments

Comments
 (0)