Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (27)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ a5e431be
...@@ -62,181 +62,112 @@ variables: ...@@ -62,181 +62,112 @@ variables:
- master - master
- tags - tags
################################### debian/bullseye:
# Debian
###################################
# buster
debian/buster:
<<: *source
variables:
DOCKER_IMAGE: debian/buster
debian/buster:x86_64:
<<: *binary
variables:
DOCKER_IMAGE: debian/buster
dependencies:
- debian/buster
test/debian/buster:x86_64:
<<: *test
variables:
DOCKER_IMAGE: debian/buster
dependencies:
- debian/buster
debian/buster:x86:
<<: *binary
variables:
DOCKER_IMAGE: debian/buster:x86
dependencies:
- debian/buster
test/debian/buster:x86:
<<: *test
variables:
DOCKER_IMAGE: debian/buster:x86
dependencies:
- debian/buster:x86
- debian/buster:x86_64
upload/debian/buster:
<<: *upload
dependencies:
- debian/buster:x86
- debian/buster:x86_64
- debian/buster
# stretch
debian/stretch:
<<: *source <<: *source
variables: variables:
DOCKER_IMAGE: debian/stretch DOCKER_IMAGE: debian/bullseye
debian/stretch:x86_64: debian/bullseye:x86_64:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: debian/stretch DOCKER_IMAGE: debian/bullseye
dependencies: dependencies:
- debian/stretch - debian/bullseye
test/debian/stretch:x86_64: test/debian/bullseye:x86_64:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/stretch DOCKER_IMAGE: debian/bullseye
dependencies: dependencies:
- debian/stretch - debian/bullseye:x86_64
debian/stretch:x86: debian/bullseye:x86:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: debian/stretch:x86 DOCKER_IMAGE: debian/bullseye:x86
dependencies: dependencies:
- debian/stretch - debian/bullseye
test/debian/stretch:x86: test/debian/bullseye:x86:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/stretch:x86 DOCKER_IMAGE: debian/bullseye:x86
dependencies: dependencies:
- debian/stretch:x86 - debian/bullseye:x86
- debian/stretch:x86_64 - debian/bullseye:x86_64
upload/debian/stretch: upload/debian/bullseye:
<<: *upload <<: *upload
dependencies: dependencies:
- debian/stretch:x86 - debian/bullseye:x86
- debian/stretch:x86_64 - debian/bullseye:x86_64
- debian/stretch - debian/bullseye
# jessie debian/buster:
debian/jessie:
<<: *source <<: *source
variables: variables:
DOCKER_IMAGE: debian/jessie DOCKER_IMAGE: debian/buster
debian/jessie:x86_64: debian/buster:x86_64:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: debian/jessie DOCKER_IMAGE: debian/buster
dependencies: dependencies:
- debian/jessie - debian/buster
test/debian/jessie:x86_64: test/debian/buster:x86_64:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/jessie DOCKER_IMAGE: debian/buster
dependencies: dependencies:
- debian/jessie - debian/buster:x86_64
debian/jessie:x86: debian/buster:x86:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: debian/jessie:x86 DOCKER_IMAGE: debian/buster:x86
dependencies: dependencies:
- debian/jessie - debian/buster
test/debian/jessie:x86: test/debian/buster:x86:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: debian/jessie:x86 DOCKER_IMAGE: debian/buster:x86
dependencies: dependencies:
- debian/jessie:x86 - debian/buster:x86
- debian/jessie:x86_64 - debian/buster:x86_64
upload/debian/jessie: upload/debian/buster:
<<: *upload <<: *upload
dependencies: dependencies:
- debian/jessie:x86 - debian/buster:x86
- debian/jessie:x86_64 - debian/buster:x86_64
- debian/jessie - debian/buster
###################################
# Ubuntu
###################################
# eoan ubuntu/jammy:
ubuntu/eoan:
<<: *source <<: *source
variables: variables:
DOCKER_IMAGE: ubuntu/eoan DOCKER_IMAGE: ubuntu/jammy
ubuntu/eoan:x86_64: ubuntu/jammy:x86_64:
<<: *binary <<: *binary
variables: variables:
DOCKER_IMAGE: ubuntu/eoan DOCKER_IMAGE: ubuntu/jammy
dependencies: dependencies:
- ubuntu/eoan - ubuntu/jammy
test/ubuntu/eoan:x86_64: test/ubuntu/jammy:x86_64:
<<: *test <<: *test
variables: variables:
DOCKER_IMAGE: ubuntu/eoan DOCKER_IMAGE: ubuntu/jammy
dependencies:
- ubuntu/eoan
ubuntu/eoan:x86:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/eoan:x86
dependencies: dependencies:
- ubuntu/eoan - ubuntu/jammy:x86_64
test/ubuntu/eoan:x86: upload/ubuntu/jammy:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/eoan:x86
dependencies:
- ubuntu/eoan:x86
- ubuntu/eoan:x86_64
upload/ubuntu/eoan:
<<: *upload <<: *upload
dependencies: dependencies:
- ubuntu/eoan:x86 - ubuntu/jammy:x86_64
- ubuntu/eoan:x86_64 - ubuntu/jammy
- ubuntu/eoan
ubuntu/focal: ubuntu/focal:
<<: *source <<: *source
...@@ -255,94 +186,10 @@ test/ubuntu/focal:x86_64: ...@@ -255,94 +186,10 @@ test/ubuntu/focal:x86_64:
variables: variables:
DOCKER_IMAGE: ubuntu/focal DOCKER_IMAGE: ubuntu/focal
dependencies: dependencies:
- ubuntu/focal - ubuntu/focal:x86_64
upload/ubuntu/focal: upload/ubuntu/focal:
<<: *upload <<: *upload
dependencies: dependencies:
- ubuntu/focal:x86_64 - ubuntu/focal:x86_64
- ubuntu/focal - ubuntu/focal
# bionic
ubuntu/bionic:
<<: *source
variables:
DOCKER_IMAGE: ubuntu/bionic
ubuntu/bionic:x86_64:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/bionic
dependencies:
- ubuntu/bionic
test/ubuntu/bionic:x86_64:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/bionic
dependencies:
- ubuntu/bionic
ubuntu/bionic:x86:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/bionic:x86
dependencies:
- ubuntu/bionic
test/ubuntu/bionic:x86:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/bionic:x86
dependencies:
- ubuntu/bionic:x86
- ubuntu/bionic:x86_64
upload/ubuntu/bionic:
<<: *upload
dependencies:
- ubuntu/bionic:x86
- ubuntu/bionic:x86_64
- ubuntu/bionic
# xenial
ubuntu/xenial:
<<: *source
variables:
DOCKER_IMAGE: ubuntu/xenial
ubuntu/xenial:x86_64:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/xenial
dependencies:
- ubuntu/xenial
test/ubuntu/xenial:x86_64:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/xenial
dependencies:
- ubuntu/xenial
ubuntu/xenial:x86:
<<: *binary
variables:
DOCKER_IMAGE: ubuntu/xenial:x86
dependencies:
- ubuntu/xenial
test/ubuntu/xenial:x86:
<<: *test
variables:
DOCKER_IMAGE: ubuntu/xenial:x86
dependencies:
- ubuntu/xenial:x86
- ubuntu/xenial:x86_64
upload/ubuntu/xenial:
<<: *upload
dependencies:
- ubuntu/xenial:x86
- ubuntu/xenial:x86_64
- ubuntu/xenial
debian/control
View file @ a5e431be
...@@ -7,8 +7,7 @@ Build-Depends: ...@@ -7,8 +7,7 @@ Build-Depends:
bison, bison,
cmake (>= 2.8.7), cmake (>= 2.8.7),
cmake (>= 3.2.2) | pkg-config, cmake (>= 3.2.2) | pkg-config,
debhelper (>= 9), debhelper (>= 10),
dh-systemd (>= 1.5),
libsystemd-dev, libsystemd-dev,
flex, flex,
g++ (>= 4:8.0) | g++-8 | g++ (<< 4:7), g++ (>= 4:8.0) | g++-8 | g++ (<< 4:7),
...@@ -16,6 +15,7 @@ Build-Depends: ...@@ -16,6 +15,7 @@ Build-Depends:
libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev, libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev,
libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev, libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev,
libboost-filesystem-dev (>= 1.66) | libboost-filesystem1.67-dev | libboost-filesystem1.67-icinga-dev, libboost-filesystem-dev (>= 1.66) | libboost-filesystem1.67-dev | libboost-filesystem1.67-icinga-dev,
libboost-iostreams-dev (>= 1.66) | libboost-iostreams1.67-dev | libboost-iostreams1.67-icinga-dev,
libboost-program-options-dev (>= 1.66) | libboost-program-options1.67-dev | libboost-program-options1.67-icinga-dev, libboost-program-options-dev (>= 1.66) | libboost-program-options1.67-dev | libboost-program-options1.67-icinga-dev,
libboost-regex-dev (>= 1.66) | libboost-regex1.67-dev | libboost-regex1.67-icinga-dev, libboost-regex-dev (>= 1.66) | libboost-regex1.67-dev | libboost-regex1.67-icinga-dev,
libboost-system-dev (>= 1.66) | libboost-system1.67-dev | libboost-system1.67-icinga-dev, libboost-system-dev (>= 1.66) | libboost-system1.67-dev | libboost-system1.67-icinga-dev,
......
debian/watch
View file @ a5e431be
...@@ -2,4 +2,4 @@ version=3 ...@@ -2,4 +2,4 @@ version=3
# filenamemangle -> prepending icinga2 if only tag name # filenamemangle -> prepending icinga2 if only tag name
# versionmangle -> convert version addition to ~ version # versionmangle -> convert version addition to ~ version
opts=filenamemangle=s/.+\/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz/icinga2-$1.tar.gz/,versionmangle=s/^([\d.]+)-(.+)?/$1~$2/ \ opts=filenamemangle=s/.+\/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz/icinga2-$1.tar.gz/,versionmangle=s/^([\d.]+)-(.+)?/$1~$2/ \
https://github.com/Icinga/icinga2/releases .*/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz https://github.com/Icinga/icinga2/tags .*/(?:icinga2-|v)([\d.]+(?:-.+)?).tar.gz