From 5ee52b85b664ffb2ff4f1417b1593edac3ccfafb Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 9 Jan 2025 16:45:16 +0100 Subject: [PATCH 1/2] CI: Standardize on 'Containerfile' naming. --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7284971d..8dce5032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,8 @@ jobs: echo 'WORKDIR /mod_proxy_cluster/native' echo 'RUN cmake . -DCMAKE_C_COMPILER=${{ matrix.compiler }}' echo 'RUN make' - } > podmanfile - podman build -f ./podmanfile - name: cmake-fedora-latest + } > Containerfile + podman build . make-fedora-latest: runs-on: ubuntu-latest @@ -73,8 +72,8 @@ jobs: echo ' make || exit 1; \' echo ' cd ..; \' echo 'done;' - } > podmanfile - podman build -f ./podmanfile + } > Containerfile + podman build . clang-format-style-check: runs-on: ubuntu-latest From a107bb51d68ed53da9ebd98dee836f646ff61dee Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 9 Jan 2025 16:47:01 +0100 Subject: [PATCH 2/2] CI: Upgrade to Fedora 41 and thus dnf5, fix options order for dnf5. --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dce5032..568e4915 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ on: jobs: cmake-fedora-latest: + name: cmake-fedora-latest runs-on: ubuntu-latest strategy: fail-fast: false @@ -30,9 +31,8 @@ jobs: - 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' @@ -55,9 +55,8 @@ jobs: - 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'