Merge branch '2.11.3' into 2.11
This commit is contained in:
commit
6de02fd360
|
@ -6,6 +6,7 @@ stages:
|
|||
variables:
|
||||
DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
|
||||
#ICINGA_BUILD_TYPE: snapshot
|
||||
ICINGA_BUILD_TYPE: release
|
||||
#ICINGA_BUILD_RELEASE_TYPE:
|
||||
#ICINGA_BUILD_TYPE:
|
||||
#ICINGA_BUILD_UPSTREAM_BRANCH:
|
||||
|
@ -105,6 +106,23 @@ upload/epel/6:
|
|||
###################################
|
||||
# Fedora
|
||||
###################################
|
||||
build/fedora/32:
|
||||
<<: *build
|
||||
variables:
|
||||
DOCKER_IMAGE: fedora/32
|
||||
|
||||
test/fedora/32:
|
||||
<<: *test
|
||||
variables:
|
||||
DOCKER_IMAGE: fedora/32
|
||||
dependencies:
|
||||
- build/fedora/32
|
||||
|
||||
upload/fedora/32:
|
||||
<<: *upload
|
||||
dependencies:
|
||||
- build/fedora/32
|
||||
|
||||
build/fedora/31:
|
||||
<<: *build
|
||||
variables:
|
||||
|
@ -193,6 +211,23 @@ upload/SUSE/15.0:
|
|||
dependencies:
|
||||
- build/sles/15.0
|
||||
|
||||
build/sles/12.5:
|
||||
<<: *build
|
||||
variables:
|
||||
DOCKER_IMAGE: sles/12.5
|
||||
|
||||
test/sles/12.5:
|
||||
<<: *test
|
||||
variables:
|
||||
DOCKER_IMAGE: sles/12.5
|
||||
dependencies:
|
||||
- build/sles/12.5
|
||||
|
||||
upload/SUSE/12.5:
|
||||
<<: *upload
|
||||
dependencies:
|
||||
- build/sles/12.5
|
||||
|
||||
build/sles/12.4:
|
||||
<<: *build
|
||||
variables:
|
||||
|
|
|
@ -97,7 +97,7 @@ License: GPLv2+
|
|||
%endif # suse
|
||||
Group: System/Monitoring
|
||||
Name: icinga2
|
||||
Version: 2.11.2
|
||||
Version: 2.11.3
|
||||
Release: %{revision}%{?dist}
|
||||
Url: https://www.icinga.com/
|
||||
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
|
||||
|
@ -832,6 +832,9 @@ fi
|
|||
%{_datadir}/nano/%{name}.nanorc
|
||||
|
||||
%changelog
|
||||
* Mon Mar 02 2020 Henrik Triem <henrik.triem@icinga.com> 2.11.3-1
|
||||
- Update to 2.11.3
|
||||
|
||||
* Thu Oct 24 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.2-1
|
||||
- Update to 2.11.2
|
||||
|
||||
|
|
Loading…
Reference in New Issue