From 83ae65ba8bad940da0ed9d11ddbbbda9d9b1b2c5 Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 9 Jan 2025 14:56:58 +0100 Subject: [PATCH 1/2] CI: Standardize on 'Containerfile' naming. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dad265b7..a5bea9b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,8 +57,8 @@ jobs: echo 'WORKDIR /mod_proxy_cluster/native' echo 'RUN cmake . -DCMAKE_C_COMPILER=${{ matrix.compiler }}' echo 'RUN make' - } > podmanfile - podman build -f ./podmanfile + } > Containerfile + podman build . name: cmake-fedora-latest make-fedora-latest: @@ -93,8 +93,8 @@ jobs: echo ' make || exit 1; \' echo ' cd ..; \' echo 'done;' - } > podmanfile - podman build -f ./podmanfile + } > Containerfile + podman build . make-with-httpd-trunk: runs-on: ubuntu-latest From de4831fa83e80d1f719e3b2b2547884606c11f29 Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 9 Jan 2025 14:57:43 +0100 Subject: [PATCH 2/2] CI: Upgrade to Fedora 41 and thus dnf5, fix options order for dnf5, and remove unnecessary container pulls. --- .github/workflows/ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5bea9b8..41948d43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,13 +45,11 @@ jobs: run: | sudo apt update sudo apt-get -y install podman - podman pull fedora:39 - name: Create container and build run: | { - echo 'FROM fedora:40' - echo 'RUN dnf install cmake httpd-devel ${{ matrix.compiler }} -y' - echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y' + echo 'FROM fedora:41' + echo 'RUN dnf install --assumeyes @c-development cmake httpd-devel ${{ matrix.compiler }}' echo 'RUN dnf clean all' echo 'COPY mod_proxy_cluster mod_proxy_cluster' echo 'WORKDIR /mod_proxy_cluster/native' @@ -72,13 +70,11 @@ jobs: run: | sudo apt update sudo apt-get -y install podman - podman pull fedora:39 - name: Create container and build run: | { - echo 'FROM fedora:40' - echo 'RUN dnf install httpd-devel redhat-rpm-config -y' - echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y' + echo 'FROM fedora:41' + echo 'RUN dnf install --assumeyes @c-development httpd-devel redhat-rpm-config' echo 'RUN dnf clean all' echo 'COPY mod_proxy_cluster mod_proxy_cluster' echo 'WORKDIR /mod_proxy_cluster/native'