Skip to content

Commit f562f38

Browse files
bas524claude
andcommitted
Make lsb_release optional; drop unavailable lsb packages from CI
redhat-lsb-core is absent from EPEL 9 and redhat-lsb is gone from Fedora 44. lsb_release is only used for log messages and DEB package naming on Ubuntu/Debian, neither of which applies to RPM builds. Degrade gracefully with a warning instead of a fatal cmake error when the binary is not present. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 0125472 commit f562f38

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/action-cpp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
apt-get update -y && apt-get install -yq binutils python3-nautilus make cmake qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools gcc g++ lsb-release
5050
;;
5151
fedora*)
52-
yum update -y && yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build redhat-lsb
52+
yum update -y && yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build
5353
;;
5454
esac
5555
run: |
@@ -257,7 +257,7 @@ jobs:
257257
yum config-manager --set-enabled crb &&
258258
yum install -y epel-release epel-next-release &&
259259
yum update -y &&
260-
yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build redhat-lsb-core
260+
yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build
261261
# build project
262262
- name: mkdir
263263
run: mkdir cmake-build-release
@@ -309,7 +309,7 @@ jobs:
309309
- uses: actions/checkout@v4
310310
# install dependencies
311311
- name: devel-pkgs
312-
run: yum update -y && yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build redhat-lsb
312+
run: yum update -y && yum install -yq binutils nautilus-python qt5-qtbase-devel qt5-qttools rpm-build
313313
# build project
314314
- name: mkdir
315315
run: mkdir cmake-build-release

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ configure_file(${CMAKE_SOURCE_DIR}/resources/qldd.desktop.in ${CMAKE_BINARY_DIR}
2121
function(get_linux_lsb_release_information)
2222
find_program(LSB_RELEASE_EXEC lsb_release)
2323
if(NOT LSB_RELEASE_EXEC)
24-
message(FATAL_ERROR "Could not detect lsb_release executable, can not gather required information")
24+
message(WARNING "lsb_release not found; distro info will be unavailable")
25+
set(LSB_RELEASE_ID_SHORT "unknown" PARENT_SCOPE)
26+
set(LSB_RELEASE_VERSION_SHORT "unknown" PARENT_SCOPE)
27+
set(LSB_RELEASE_CODENAME_SHORT "unknown" PARENT_SCOPE)
28+
return()
2529
endif()
2630

2731
execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)

0 commit comments

Comments
 (0)