Skip to content

ci: add Fedora 41, drop Fedora 39 #3154

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
pcolberg merged 3 commits into from
Feb 5, 2025
Merged

ci: add Fedora 41, drop Fedora 39 #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af3474d
packaging: only install distribution packages on Rocky Linux 9
pcolberg Feb 5, 2025
2a40db9
packaging: update rpm spec file to match Fedora package
pcolberg Feb 5, 2025
3955d65
packaging: add Fedora 41, drop Fedora 39
pcolberg Dec 5, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-rpms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
RPM:
strategy:
matrix:
distro: [fedora39, fedora40, rockylinux8, rockylinux9]
distro: [fedora40, fedora41, rockylinux8, rockylinux9]
runs-on: ubuntu-22.04
name: Build ${{ matrix.distro }}
steps:
Expand Down
8 changes: 0 additions & 8 deletions docker/fedora39/Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions docker/fedora40/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM fedora:40
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 git make cmake libuuid-devel json-c-devel gcc clang gcc-c++ libuuid-devel json-c-devel hwloc-devel tbb-devel libedit-devel rpm-build rpmdevtools pybind11-devel python3-virtualenv yaml-cpp-devel libudev-devel cli11-devel spdlog-devel systemd numactl-devel
RUN python3 -m pip install setuptools --upgrade --prefix=/usr
RUN python3 -m pip install pyyaml jsonschema
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 python3-setuptools python3-wheel git make cmake libuuid-devel json-c-devel gcc clang gcc-c++ libuuid-devel json-c-devel hwloc-devel tbb-devel libedit-devel rpm-build rpmdevtools pybind11-devel python3-virtualenv yaml-cpp-devel libudev-devel cli11-devel spdlog-devel systemd numactl-devel
WORKDIR /root
COPY scripts/build-rpms-new.sh /scripts/build-rpms-new.sh
COPY scripts/test-rpms.sh /scripts/test-rpms.sh
Expand Down
6 changes: 6 additions & 0 deletions docker/fedora41/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM fedora:41
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 python3-setuptools python3-wheel git make cmake libuuid-devel json-c-devel gcc clang gcc-c++ libuuid-devel json-c-devel hwloc-devel tbb-devel libedit-devel rpm-build rpmdevtools pybind11-devel python3-virtualenv yaml-cpp-devel libudev-devel cli11-devel spdlog-devel systemd numactl-devel
WORKDIR /root
COPY scripts/build-rpms-new.sh /scripts/build-rpms-new.sh
COPY scripts/test-rpms.sh /scripts/test-rpms.sh
ENTRYPOINT ["/scripts/build-rpms-new.sh"]
2 changes: 1 addition & 1 deletion docker/rockylinux8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN dnf config-manager --set-enabled powertools
RUN dnf install -y epel-release
RUN dnf check-update || true
RUN dnf upgrade -y
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml gdb vim git gcc gcc-c++ make cmake libuuid-devel json-c-devel hwloc-devel tbb-devel cli11-devel spdlog-devel libedit-devel systemd-devel doxygen python3-sphinx pandoc rpm-build rpmdevtools python3-virtualenv yaml-cpp-devel libudev-devel libcap-devel sudo numactl-devel
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-setuptools python3-wheel gdb vim git gcc gcc-c++ make cmake libuuid-devel json-c-devel hwloc-devel tbb-devel cli11-devel spdlog-devel libedit-devel systemd-devel doxygen python3-sphinx pandoc rpm-build rpmdevtools python3-virtualenv yaml-cpp-devel libudev-devel libcap-devel sudo numactl-devel

RUN python3 -m pip install --user jsonschema virtualenv pudb pyyaml pybind11 && \
# setuptools < ~51.x will fail to process the pyproject.toml successfully, so we upgrade
Expand Down
11 changes: 1 addition & 10 deletions docker/rockylinux9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,7 @@ RUN dnf config-manager --set-enabled crb
RUN dnf install -y epel-release
RUN dnf check-update || true
RUN dnf upgrade -y
RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml gdb vim git gcc gcc-c++ make cmake libuuid-devel json-c-devel hwloc-devel tbb-devel cli11-devel spdlog-devel libedit-devel systemd-devel doxygen python3-sphinx pandoc rpm-build rpmdevtools python3-virtualenv yaml-cpp-devel libudev-devel libcap-devel sudo numactl-devel

RUN python3 -m pip install --user jsonschema virtualenv pudb pyyaml pybind11 && \
# setuptools < ~51.x will fail to process the pyproject.toml successfully, so we upgrade
# /usr is required to target the correct Python installation, as it has been found to fail when only affecting /usr/local
/usr/bin/python3 -m pip install setuptools --upgrade --prefix /usr && \
# the pip version has to be at least 10.0.0b1 for the build scripts to run, however the pip installed through dnf is only version 9
# similar to setuptools, it has been found to fail when only affecting /usr/local
/usr/bin/python3 -m pip install --upgrade pip --prefix=/usr

RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 python3-setuptools python3-wheel gdb vim git gcc gcc-c++ make cmake libuuid-devel json-c-devel hwloc-devel tbb-devel cli11-devel spdlog-devel libedit-devel systemd-devel doxygen python3-sphinx pandoc rpm-build rpmdevtools python3-virtualenv yaml-cpp-devel libudev-devel libcap-devel numactl-devel
WORKDIR /root

COPY scripts/test-rpms.sh /scripts/test-rpms.sh
Expand Down
Loading