Skip to content
Snippets Groups Projects
Commit 033e864f authored by Julian Brost's avatar Julian Brost :unicorn:
Browse files

Build 2.11.9 + v1/execute-command + ApiListener#connect_timeout

parent e62a6d97
No related branches found
No related tags found
No related merge requests found
Pipeline #18748 passed
......@@ -5,8 +5,8 @@ stages:
variables:
DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
#ICINGA_BUILD_TYPE: snapshot
ICINGA_BUILD_TYPE: release
ICINGA_BUILD_TYPE: snapshot
ICINGA_BUILD_UPSTREAM_BRANCH: jbrost/2.11.9-with-execute-command-and-connect-timeout
.build: &build
stage: build
......
......@@ -68,14 +68,6 @@
%bcond_without unity_build
%endif
# Disable lto_build for older SUSE versions
# see https://github.com/Icinga/icinga2/issues/7149
%if "%{_vendor}" == "suse" && 0%{?suse_version} <= 1315
%bcond_with lto_build
%else # suse_version 1315
%bcond_without lto_build
%endif # suse_version 1315
%bcond_with systemd_and_init
%bcond_without compat
%bcond_without livestatus
......@@ -371,11 +363,7 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON"
%else
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF"
%endif
%if %{with lto_build}
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON"
%else
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF"
%endif
%if %{with systemd_and_init}
CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON"
%else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment