Skip to content

CI: Standardize on 'Containerfile' naming and Upgrade to Fedora 41 #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhusar merged 2 commits into from
Jan 10, 2025
Merged

CI: Standardize on 'Containerfile' naming and Upgrade to Fedora 41 #312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee52b8
CI: Standardize on 'Containerfile' naming.
rhusar Jan 9, 2025
a107bb5
CI: Upgrade to Fedora 41 and thus dnf5, fix options order for dnf5.
rhusar Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
jobs:

cmake-fedora-latest:
name: cmake-fedora-latest
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -30,17 +31,15 @@ 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'
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
Expand All @@ -56,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'
Expand All @@ -73,8 +71,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
Expand Down
Loading