From 47168f794da4b1335591aa7ec3f489c22db88292 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Mon, 18 Nov 2024 10:25:22 +0200 Subject: [PATCH] Misc Fedora-related improvements (#638) * actions: Drop Fedora 39 Fedora 39 drops is EOL from 12 Nov 2024. Signed-off-by: Priit Laes * Sync list of required Fedora dependencies Additionally splits out list of required Fedora dependencies into separate variable in github actions. Fixes #637 Signed-off-by: Priit Laes * actions: Fedora: Add Rawhide Include Rawhide in the build matrix as well to spot upcoming issues, first one would be dropping support for OpenJDK 17 in favor of Adoptium managed Eclipse Temurin releases via separate repsitory: https://fedoraproject.org/wiki/Changes/ThirdPartyLegacyJdks Ideally this build should be gated as `allow-fail`, but unfortunately github actions does not support it yet. Signed-off-by: Priit Laes * actions: Fedora: Use Java 21 (LTS) Java 17 was already deprecated since Fedora 39, and is already dropped in upcoming Fedora 42 (current Rawhide). Signed-off-by: Priit Laes * actions: fedora: fix minizip dependency Apparently we need to use minizip-ng-compat library for MiniZip support Signed-off-by: Priit Laes --------- Signed-off-by: Priit Laes --- .github/workflows/build.yml | 12 ++++-------- README.md | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7407ca70b..4fa491c09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,8 @@ permissions: env: BUILD_NUMBER: ${{ github.run_number }} CMAKE_BUILD_PARALLEL_LEVEL: 4 + # Required dependencies (does not include packaging and optional dependencies) + FEDORA_DEPS: cmake gcc-c++ libtool-ltdl-devel libxml2-devel minizip-ng-compat-devel zlib-devel xmlsec1-openssl-devel UBUNTU_DEPS: cmake libxml2-dev libxmlsec1-dev zlib1g-dev jobs: macos: @@ -72,18 +74,12 @@ jobs: container: fedora:${{ matrix.container }} strategy: matrix: - container: [39, 40, 41] + container: [40, 41, rawhide] steps: - name: Install Deps run: | dnf install -y --setopt=install_weak_deps=False \ - git gcc-c++ cmake rpm-build libxml2-devel xmlsec1-openssl-devel libtool-ltdl-devel zlib-devel doxygen boost-test swig python3-devel java-17-openjdk-devel minizip-devel - - name: Install CMake - if: matrix.container == 39 - run: | - dnf install -y --setopt=install_weak_deps=False wget - wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh - sh cmake-3.28.1-linux-x86_64.sh --skip-license --prefix=/usr/local + ${FEDORA_DEPS} doxygen boost-test swig python3-devel java-21-openjdk-devel rpm-build git - name: Checkout uses: actions/checkout@v4 - name: Build diff --git a/README.md b/README.md index 74c0c80a3..f33445cb4 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ # Ubuntu sudo apt install cmake libxml2-dev libxmlsec1-dev zlib1g-dev # Fedora - sudo dnf install cmake gcc-c++ openssl-devel libxml2-devel xmlsec1-openssl-devel libtool-ltdl-devel zlib-devel + sudo dnf install cmake gcc-c++ libtool-ltdl-devel libxml2-devel minizip-ng-compat-devel openssl-devel zlib-devel xmlsec1-openssl-devel * doxygen - Optional, for API documentation * libboost-test-dev - Optional, for unittests