From ef2bc16d687118889f09ab2431a6f397ffa24e96 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 5 Dec 2024 15:39:32 -0500 Subject: [PATCH] ci: add Fedora 41, drop Fedora 39 Signed-off-by: Peter Colberg --- .github/workflows/build-rpms.yml | 2 +- docker/fedora39/Dockerfile | 8 -------- docker/fedora41/Dockerfile | 8 ++++++++ 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 docker/fedora39/Dockerfile create mode 100644 docker/fedora41/Dockerfile diff --git a/.github/workflows/build-rpms.yml b/.github/workflows/build-rpms.yml index 35bcf631d6d7..37f2ff954c80 100644 --- a/.github/workflows/build-rpms.yml +++ b/.github/workflows/build-rpms.yml @@ -24,7 +24,7 @@ jobs: RPM: strategy: matrix: - distro: [fedora39, fedora40, rockylinux8, rockylinux9] + distro: [fedora40, fedora41, rockylinux8, rockylinux9] runs-on: ubuntu-latest name: Build ${{ matrix.distro }} steps: diff --git a/docker/fedora39/Dockerfile b/docker/fedora39/Dockerfile deleted file mode 100644 index fdd2e15d942c..000000000000 --- a/docker/fedora39/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM fedora:39 -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 -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"] diff --git a/docker/fedora41/Dockerfile b/docker/fedora41/Dockerfile new file mode 100644 index 000000000000..4e1406cd89f2 --- /dev/null +++ b/docker/fedora41/Dockerfile @@ -0,0 +1,8 @@ +FROM fedora:41 +RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 python3-setuptools 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 +# Permit git to operate on repositories not owned by current user. +RUN git config --system safe.directory '*' +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"]