Skip to content

Commit b77b19c

Browse files
Merge pull request syslog-ng#5015 from syslog-ng/dbld-fix-rawhide
Fixed Fedora Rawhide not Building in DBLD
2 parents 7ed2cdc + 48e4067 commit b77b19c

File tree

5 files changed

+15
-7
lines changed

5 files changed

+15
-7
lines changed

.github/workflows/packages.yml

+2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ jobs:
3636
distros: '[
3737
"almalinux-8",
3838
"almalinux-9",
39+
"centos-stream9",
3940
"debian-bookworm",
4041
"debian-testing",
4142
"fedora-latest",
43+
"fedora-rawhide",
4244
"ubuntu-noble"
4345
]'

dbld/builddeps

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ function install_dbld_dependencies()
3131
{
3232
case "${OS_DISTRIBUTION}" in
3333
centos|almalinux)
34-
$YUM_INSTALL wget yum-utils
34+
$YUM_INSTALL yum-utils
3535
;;
3636
debian|ubuntu)
3737
apt-get update
38-
$APT_INSTALL wget gnupg2
38+
$APT_INSTALL curl gnupg2
3939
;;
4040
fedora)
41-
$DNF_INSTALL -y wget dnf-plugins-core
41+
$DNF_INSTALL -y dnf-plugins-core
4242
;;
4343
esac
4444
}
@@ -92,7 +92,7 @@ function install_pip2 {
9292
function download_target() {
9393
target=$1
9494
output=$2
95-
wget --no-check-certificate $target --output-document=$output
95+
curl --location --insecure "$target" --output "$output"
9696
}
9797

9898
function filter_packages_by_platform {
@@ -214,9 +214,9 @@ function install_perf {
214214
function install_bison_from_source {
215215
BISON_VERSION=3.7.6
216216
cd /tmp
217-
wget https://ftp.gnu.org/gnu/bison/bison-${BISON_VERSION}.tar.gz
218-
tar xvfz bison-${BISON_VERSION}.tar.gz
219-
cd bison-${BISON_VERSION}
217+
download_target https://ftp.gnu.org/gnu/bison/bison-${BISON_VERSION}.tar.gz /tmp/bison-${BISON_VERSION}.tar.gz
218+
tar xvfz /tmp/bison-${BISON_VERSION}.tar.gz
219+
cd /tmp/bison-${BISON_VERSION}
220220
./configure --prefix=/usr/local --disable-nls
221221
make && make install
222222
}

dbld/images/centos-stream9.dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ RUN /dbld/builddeps install_rpm_build_deps
2020
RUN /dbld/builddeps install_criterion
2121
RUN /dbld/builddeps install_gradle
2222

23+
RUN dnf upgrade -y
24+
2325
VOLUME /source
2426
VOLUME /build
2527

dbld/images/debian-testing.dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN /dbld/builddeps install_dbld_dependencies
1919
RUN /dbld/builddeps install_apt_packages
2020
RUN /dbld/builddeps install_debian_build_deps
2121

22+
RUN apt upgrade -y
23+
2224
VOLUME /source
2325
VOLUME /build
2426

dbld/images/fedora-rawhide.dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ RUN /dbld/builddeps install_rpm_build_deps
2020
RUN /dbld/builddeps install_criterion
2121
RUN /dbld/builddeps install_gradle
2222

23+
RUN dnf upgrade -y
24+
2325
VOLUME /source
2426
VOLUME /build
2527

0 commit comments

Comments
 (0)