Skip to content

Commit 47168f7

Browse files
authored
Misc Fedora-related improvements (#638)
* actions: Drop Fedora 39 Fedora 39 drops is EOL from 12 Nov 2024. Signed-off-by: Priit Laes <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * actions: fedora: fix minizip dependency Apparently we need to use minizip-ng-compat library for MiniZip support Signed-off-by: Priit Laes <[email protected]> --------- Signed-off-by: Priit Laes <[email protected]>
1 parent 492edb6 commit 47168f7

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ permissions:
55
env:
66
BUILD_NUMBER: ${{ github.run_number }}
77
CMAKE_BUILD_PARALLEL_LEVEL: 4
8+
# Required dependencies (does not include packaging and optional dependencies)
9+
FEDORA_DEPS: cmake gcc-c++ libtool-ltdl-devel libxml2-devel minizip-ng-compat-devel zlib-devel xmlsec1-openssl-devel
810
UBUNTU_DEPS: cmake libxml2-dev libxmlsec1-dev zlib1g-dev
911
jobs:
1012
macos:
@@ -72,18 +74,12 @@ jobs:
7274
container: fedora:${{ matrix.container }}
7375
strategy:
7476
matrix:
75-
container: [39, 40, 41]
77+
container: [40, 41, rawhide]
7678
steps:
7779
- name: Install Deps
7880
run: |
7981
dnf install -y --setopt=install_weak_deps=False \
80-
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
81-
- name: Install CMake
82-
if: matrix.container == 39
83-
run: |
84-
dnf install -y --setopt=install_weak_deps=False wget
85-
wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh
86-
sh cmake-3.28.1-linux-x86_64.sh --skip-license --prefix=/usr/local
82+
${FEDORA_DEPS} doxygen boost-test swig python3-devel java-21-openjdk-devel rpm-build git
8783
- name: Checkout
8884
uses: actions/checkout@v4
8985
- name: Build

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Ubuntu
1919
sudo apt install cmake libxml2-dev libxmlsec1-dev zlib1g-dev
2020
# Fedora
21-
sudo dnf install cmake gcc-c++ openssl-devel libxml2-devel xmlsec1-openssl-devel libtool-ltdl-devel zlib-devel
21+
sudo dnf install cmake gcc-c++ libtool-ltdl-devel libxml2-devel minizip-ng-compat-devel openssl-devel zlib-devel xmlsec1-openssl-devel
2222

2323
* doxygen - Optional, for API documentation
2424
* libboost-test-dev - Optional, for unittests

0 commit comments

Comments
 (0)