From ed3a049b0d3ce8399ed2e8401c12ca7ba625b05d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 19 Jul 2021 12:23:21 +0200 Subject: [PATCH 01/22] Add .gitignore --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2f655a --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +## Build +/build/ +/ccache/ + +## Snapshot Artifacts +/*.git/ +/*.tar* +/*.version + +## Editors +*~ +.*.sw[op] -- GitLab From 6beb53bbdf55abce932c7789aca2f890940c9af3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 19 Jul 2021 13:07:23 +0200 Subject: [PATCH 02/22] Make snapshot builds work --- .gitlab-ci.yml | 2 +- get_snapshot | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100755 get_snapshot diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e313fae..f894242 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker ICINGA_BUILD_TYPE: snapshot - #ICINGA_BUILD_UPSTREAM_BRANCH: + ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly .build: &build stage: build diff --git a/get_snapshot b/get_snapshot new file mode 100755 index 0000000..f22a8df --- /dev/null +++ b/get_snapshot @@ -0,0 +1,87 @@ +#!/bin/bash +# Copyright (c) 2017 Icinga Development Team +# Licensed as GPL-2.0+ + +set -e + +while getopts ":p:U:b:" opt +do + case "$opt" in + p) + PROJECT="$OPTARG" + ;; + U) + UPSTREAM_GIT_URL="$OPTARG" + ;; + b) + UPSTREAM_GIT_BRANCH="$OPTARG" + ;; + \?) + echo "Unknown argument: $OPTARG" >&2 + exit 1 + ;; + esac +done + +: ${PROJECT:=icinga-php-library} +: ${UPSTREAM_GIT_URL:=https://github.com/Icinga/$PROJECT.git} +: ${UPSTREAM_GIT_BRANCH:=snapshot/nightly} + +set -x + +if [ -z "$UPSTREAM_GIT_NOREPO" ]; then + if [ -d "${PROJECT}.git/" ]; then + cd "${PROJECT}.git" + if [ ! -d .git ]; then + echo "This is not a GIT repository: $(pwd)" >&2 + exit 1 + fi + if [ -z "$UPSTREAM_GIT_NOUPDATE" ]; then + if [ "$(git config remote.origin.url)" != "${UPSTREAM_GIT_URL}" ]; then + git remote set-url origin "${UPSTREAM_GIT_URL}" + fi + git fetch origin -p + git checkout -f "${UPSTREAM_GIT_BRANCH}" + git reset --hard "origin/${UPSTREAM_GIT_BRANCH}" + fi + git clean -fdx + elif [ -z "$UPSTREAM_GIT_NOUPDATE" ]; then + git clone -b "${UPSTREAM_GIT_BRANCH}" "${UPSTREAM_GIT_URL}" "${PROJECT}.git/" + cd "${PROJECT}.git" + else + echo "Missing '${PROJECT}.git' directory!" >&2 + exit 1 + fi +fi + +git_version=$(git describe --tags "${UPSTREAM_GIT_BRANCH}") +git_commit=$(git rev-parse "${UPSTREAM_GIT_BRANCH}") +package_version=$(echo "$git_version" | sed -e 's/^v//' -e 's/-/./g') +prefix="${PROJECT}-${package_version}" +tarball="${prefix}.orig.tar" + +git archive --format=tar --prefix="${prefix}/" -o "../${tarball}" "${UPSTREAM_GIT_BRANCH}" + +cd ../ + +# create files with the properly set versions for snapshot +rm -rf "${prefix:?}/" + +mkdir -p "${prefix:?}/" +echo "${package_version}" > "${prefix:?}/VERSION" + +# add to tarball and remove tmpdir +tar --append -f "${tarball}" "${prefix}"/ +rm -rf "${prefix:?}/" + +# pack tarball +gzip -vf9 "${tarball}" +sha256sum "${tarball}.gz" + +# store package version for build scripts +printf '%s\t%s\t%s\t%s' \ + "${package_version}" \ + "${git_commit}" \ + "$(basename "${tarball}.gz")" \ + "${UPSTREAM_GIT_BRANCH}" \ + > "${PROJECT}.version" -- GitLab From a2a526919447398a2b0f4a9245a83448f1eeac3d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 19 Jul 2021 13:07:40 +0200 Subject: [PATCH 03/22] Add test script --- testing/live_test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 testing/live_test.sh diff --git a/testing/live_test.sh b/testing/live_test.sh new file mode 100755 index 0000000..0c19e06 --- /dev/null +++ b/testing/live_test.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# this script runs in the rpm_test environment + +PACKAGES=( icinga-php-library ) + +icinga-build-rpm-install "${PACKAGES[@]}" + +bash -- GitLab From cff7d8950e2659c993a232b151ac6b9d58cd8cc5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 20 Jul 2021 14:03:21 +0200 Subject: [PATCH 04/22] Add missing php extension requirements --- icinga-php-library.spec | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 7e91a29..6ed1329 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -13,10 +13,35 @@ URL: https://icinga.com Source0: https://github.com/Icinga/%{module_name}/archive/v%{version}.tar.gz BuildArch: noarch +# Define php runtime identifier +%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} +%if 0%{?rhel} == 7 +%define php_scl rh-php73 +%endif + +%if 0%{?php_scl:1} +%define php_scl_prefix %{php_scl}- +%endif + +%define php %{?php_scl_prefix}php +%endif + +%if 0%{?suse_version} +%define php php +%endif + %global basedir %{_datadir}/icinga-php/ipl Requires: icinga-php-common +# php extension requirements +Requires: %{php}-intl +%{?rhel:Requires: %{php}-pdo} +%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +Requires: %{php}-json +%endif + %description This project bundles all Icinga PHP libraries into one piece and can be integrated as library into Icinga Web 2. -- GitLab From 479715e3bb3674c51603dbac44e90b0ccccb3071 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 27 Jul 2021 11:18:25 +0200 Subject: [PATCH 05/22] Release 0.6.1-1 --- icinga-php-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 6ed1329..df61bcc 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.6.0 +Version: 0.6.1 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -67,5 +67,8 @@ rm -rf %{buildroot} %{basedir} %changelog +* Tue Jul 27 2021 Johannes Meyer - 0.6.1-1 +- Release 0.6.1 + * Thu Jul 08 2021 Henrik Triem - 0.6.0-1 - Release 0.6.0 -- GitLab From a7666b8ea56ad4d87fde2f15bc5225c660d9920a Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Thu, 29 Jul 2021 17:38:36 +0200 Subject: [PATCH 06/22] Add support for SLES 15.3 --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f894242..7e0eb51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,6 +118,23 @@ upload/fedora/33: ################################### # SLES ################################### +build/sles/15.3: + <<: *build + variables: + DOCKER_IMAGE: sles/15.3 + +test/sles/15.3: + <<: *test + variables: + DOCKER_IMAGE: sles/15.3 + dependencies: + - build/sles/15.3 + +upload/SUSE/15.3: + <<: *upload + dependencies: + - build/sles/15.3 + build/sles/15.2: <<: *build variables: @@ -155,6 +172,23 @@ upload/SUSE/12.5: ################################### # openSUSE ################################### +build/opensuse/15.3: + <<: *build + variables: + DOCKER_IMAGE: opensuse/15.3 + +test/opensuse/15.3: + <<: *test + variables: + DOCKER_IMAGE: opensuse/15.3 + dependencies: + - build/opensuse/15.3 + +upload/openSUSE/15.3: + <<: *upload + dependencies: + - build/opensuse/15.3 + build/opensuse/15.2: <<: *build variables: -- GitLab From 5f19eaf151e32a9268ce3e183d5ca9b4d821e517 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 10 Nov 2021 15:33:00 +0100 Subject: [PATCH 07/22] Release 0.7.0-1 (cherry picked from commit d6b01637bc28369fbf98280061482f7b28749422) --- icinga-php-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index df61bcc..24f9ebf 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.6.1 +Version: 0.7.0 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -67,6 +67,9 @@ rm -rf %{buildroot} %{basedir} %changelog +* Wed Nov 10 2021 Johannes Meyer - 0.7.0-1 +- Release 0.7.0 + * Tue Jul 27 2021 Johannes Meyer - 0.6.1-1 - Release 0.6.1 -- GitLab From cb371e339198a4a0e6fd4c471ded6f450220c5ed Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 17 Nov 2021 18:04:10 +0000 Subject: [PATCH 08/22] Add Fedora 35 --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e0eb51..95ffb15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,6 +81,23 @@ upload/epel/7: ################################### # Fedora ################################### +build/fedora/35: + <<: *build + variables: + DOCKER_IMAGE: fedora/35 + +test/fedora/35: + <<: *test + variables: + DOCKER_IMAGE: fedora/35 + dependencies: + - build/fedora/35 + +upload/fedora/35: + <<: *upload + dependencies: + - build/fedora/35 + build/fedora/34: <<: *build variables: -- GitLab From 5218af0700b126a4a2fee340051494afe024a440 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 2 Feb 2022 14:47:20 +0000 Subject: [PATCH 09/22] Drop Fedora 33 --- .gitlab-ci.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e0eb51..46e55ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,23 +98,6 @@ upload/fedora/34: dependencies: - build/fedora/34 -build/fedora/33: - <<: *build - variables: - DOCKER_IMAGE: fedora/33 - -test/fedora/33: - <<: *test - variables: - DOCKER_IMAGE: fedora/33 - dependencies: - - build/fedora/33 - -upload/fedora/33: - <<: *upload - dependencies: - - build/fedora/33 - ################################### # SLES ################################### -- GitLab From b2a4dff68901aaa38cf5c3a5bf212b451c401225 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 2 Feb 2022 15:33:25 +0000 Subject: [PATCH 10/22] Drop openSUSE 15.2 --- .gitlab-ci.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e0eb51..c056d33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,20 +188,3 @@ upload/openSUSE/15.3: <<: *upload dependencies: - build/opensuse/15.3 - -build/opensuse/15.2: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.2 - -test/opensuse/15.2: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.2 - dependencies: - - build/opensuse/15.2 - -upload/openSUSE/15.2: - <<: *upload - dependencies: - - build/opensuse/15.2 -- GitLab From e526b86a3c5d077ee7082cbb1a425dab47ae9c52 Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Sun, 27 Feb 2022 21:54:51 +0000 Subject: [PATCH 11/22] Remove subscription OS --- .gitlab-ci.yml | 58 ++------------------------------------------------ 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e0eb51..5e5811d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ test/centos/8: dependencies: - build/centos/8 -upload/epel/8: +upload/centos/8: <<: *upload dependencies: - build/centos/8 @@ -73,7 +73,7 @@ test/centos/7: dependencies: - build/centos/7 -upload/epel/7: +upload/centos/7: <<: *upload dependencies: - build/centos/7 @@ -115,60 +115,6 @@ upload/fedora/33: dependencies: - build/fedora/33 -################################### -# SLES -################################### -build/sles/15.3: - <<: *build - variables: - DOCKER_IMAGE: sles/15.3 - -test/sles/15.3: - <<: *test - variables: - DOCKER_IMAGE: sles/15.3 - dependencies: - - build/sles/15.3 - -upload/SUSE/15.3: - <<: *upload - dependencies: - - build/sles/15.3 - -build/sles/15.2: - <<: *build - variables: - DOCKER_IMAGE: sles/15.2 - -test/sles/15.2: - <<: *test - variables: - DOCKER_IMAGE: sles/15.2 - dependencies: - - build/sles/15.2 - -upload/SUSE/15.2: - <<: *upload - dependencies: - - build/sles/15.2 - -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 - ################################### # openSUSE ################################### -- GitLab From 662f3f59df9fbf4fcba0670f1bde3281c69f9407 Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Sun, 27 Feb 2022 21:55:18 +0000 Subject: [PATCH 12/22] Remove CentOS 8 --- .gitlab-ci.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e5811d..0bdcb7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,23 +44,6 @@ variables: ################################### # EPEL ################################### -build/centos/8: - <<: *build - variables: - DOCKER_IMAGE: centos/8 - -test/centos/8: - <<: *test - variables: - DOCKER_IMAGE: centos/8 - dependencies: - - build/centos/8 - -upload/centos/8: - <<: *upload - dependencies: - - build/centos/8 - build/centos/7: <<: *build variables: -- GitLab From 8ade7363487f504177a457fe107f653f9708bd42 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 23 Mar 2022 12:19:59 +0100 Subject: [PATCH 13/22] Release 0.8.0-1 (cherry picked from commit d11d4c23a390ad317599975923d13ff60a148973) --- icinga-php-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 24f9ebf..56f2b64 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.7.0 +Version: 0.8.0 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -67,6 +67,9 @@ rm -rf %{buildroot} %{basedir} %changelog +* Wed Mar 23 2022 Johannes Meyer - 0.8.0-1 +- Release 0.8.0 + * Wed Nov 10 2021 Johannes Meyer - 0.7.0-1 - Release 0.7.0 -- GitLab From 0278ec08dde3db8d98dcb3fd575b25f6e4becaf8 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 26 Apr 2022 14:55:08 +0200 Subject: [PATCH 14/22] Release 0.8.1-1 --- icinga-php-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 56f2b64..10989af 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.8.0 +Version: 0.8.1 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -67,6 +67,9 @@ rm -rf %{buildroot} %{basedir} %changelog +* Tue Apr 26 2022 Johannes Meyer - 0.8.1-1 +- Release 0.8.1 + * Wed Mar 23 2022 Johannes Meyer - 0.8.0-1 - Release 0.8.0 -- GitLab From adebd6d1b8c51e35e37c81d0c38724fc9352efbb Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 7 Jun 2022 15:20:51 +0200 Subject: [PATCH 15/22] Only build on CentOS 7 --- .gitlab-ci.yml | 57 -------------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e925ad..0ab20ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,60 +60,3 @@ upload/centos/7: <<: *upload dependencies: - build/centos/7 - -################################### -# Fedora -################################### -build/fedora/35: - <<: *build - variables: - DOCKER_IMAGE: fedora/35 - -test/fedora/35: - <<: *test - variables: - DOCKER_IMAGE: fedora/35 - dependencies: - - build/fedora/35 - -upload/fedora/35: - <<: *upload - dependencies: - - build/fedora/35 - -build/fedora/34: - <<: *build - variables: - DOCKER_IMAGE: fedora/34 - -test/fedora/34: - <<: *test - variables: - DOCKER_IMAGE: fedora/34 - dependencies: - - build/fedora/34 - -upload/fedora/34: - <<: *upload - dependencies: - - build/fedora/34 - -################################### -# openSUSE -################################### -build/opensuse/15.3: - <<: *build - variables: - DOCKER_IMAGE: opensuse/15.3 - -test/opensuse/15.3: - <<: *test - variables: - DOCKER_IMAGE: opensuse/15.3 - dependencies: - - build/opensuse/15.3 - -upload/openSUSE/15.3: - <<: *upload - dependencies: - - build/opensuse/15.3 -- GitLab From 0b1896a59e7ea14177d255d165fff40d5d0ad26b Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 7 Jun 2022 15:21:03 +0200 Subject: [PATCH 16/22] Require icinga-php-thirdparty --- icinga-php-library.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 10989af..aa17132 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -33,6 +33,7 @@ BuildArch: noarch %global basedir %{_datadir}/icinga-php/ipl Requires: icinga-php-common +Requires: icinga-php-thirdparty # php extension requirements Requires: %{php}-intl -- GitLab From 959cf338bbf7c8bcf6da7dd3e160b279790b1a9b Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 22 Jun 2022 23:58:41 +0200 Subject: [PATCH 17/22] Build Fedora v35 and v36 --- .gitlab-ci.yml | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ab20ee..92232c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,9 +41,6 @@ variables: - master - tags -################################### -# EPEL -################################### build/centos/7: <<: *build variables: @@ -60,3 +57,39 @@ upload/centos/7: <<: *upload dependencies: - build/centos/7 + +build/fedora/36: + <<: *build + variables: + DOCKER_IMAGE: fedora/36 + RPM_BUILD_NCPUS: '1' + +test/fedora/36: + <<: *test + variables: + DOCKER_IMAGE: fedora/36 + dependencies: + - build/fedora/36 + +upload/fedora/36: + <<: *upload + dependencies: + - build/fedora/36 + +build/fedora/35: + <<: *build + variables: + DOCKER_IMAGE: fedora/35 + RPM_BUILD_NCPUS: '1' + +test/fedora/35: + <<: *test + variables: + DOCKER_IMAGE: fedora/35 + dependencies: + - build/fedora/35 + +upload/fedora/35: + <<: *upload + dependencies: + - build/fedora/35 -- GitLab From 05a6e8195fe5c78e2a1807110ff70319fcf012d1 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 22 Jun 2022 23:59:19 +0200 Subject: [PATCH 18/22] Build openSUSE v15.3 and v15.4 --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92232c6..ea602f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,3 +93,37 @@ upload/fedora/35: <<: *upload dependencies: - build/fedora/35 + +build/opensuse/15.4: + <<: *build + variables: + DOCKER_IMAGE: opensuse/15.4 + +test/opensuse/15.4: + <<: *test + variables: + DOCKER_IMAGE: opensuse/15.4 + dependencies: + - build/opensuse/15.4 + +upload/opensuse/15.4: + <<: *upload + dependencies: + - build/opensuse/15.4 + +build/opensuse/15.3: + <<: *build + variables: + DOCKER_IMAGE: opensuse/15.3 + +test/opensuse/15.3: + <<: *test + variables: + DOCKER_IMAGE: opensuse/15.3 + dependencies: + - build/opensuse/15.3 + +upload/opensuse/15.3: + <<: *upload + dependencies: + - build/opensuse/15.3 -- GitLab From 2b3f7a5598e3f3e79d19d09d1733bf4af1ab08b4 Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Thu, 30 Jun 2022 04:39:19 +0200 Subject: [PATCH 19/22] Raise version to 0.9.0 --- .gitlab-ci.yml | 29 +++++++++++++++++++---------- icinga-php-library.spec | 5 ++++- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea602f9..52e7fb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,9 @@ variables: - master - tags +################################### +# Centos +################################### build/centos/7: <<: *build variables: @@ -58,6 +61,9 @@ upload/centos/7: dependencies: - build/centos/7 +################################### +# Fedora +################################### build/fedora/36: <<: *build variables: @@ -69,12 +75,12 @@ test/fedora/36: variables: DOCKER_IMAGE: fedora/36 dependencies: - - build/fedora/36 + - build/fedora/36 upload/fedora/36: <<: *upload dependencies: - - build/fedora/36 + - build/fedora/36 build/fedora/35: <<: *build @@ -87,13 +93,16 @@ test/fedora/35: variables: DOCKER_IMAGE: fedora/35 dependencies: - - build/fedora/35 + - build/fedora/35 upload/fedora/35: <<: *upload dependencies: - - build/fedora/35 + - build/fedora/35 +################################### +# openSUSE +################################### build/opensuse/15.4: <<: *build variables: @@ -104,12 +113,12 @@ test/opensuse/15.4: variables: DOCKER_IMAGE: opensuse/15.4 dependencies: - - build/opensuse/15.4 + - build/opensuse/15.4 -upload/opensuse/15.4: +upload/openSUSE/15.4: <<: *upload dependencies: - - build/opensuse/15.4 + - build/opensuse/15.4 build/opensuse/15.3: <<: *build @@ -121,9 +130,9 @@ test/opensuse/15.3: variables: DOCKER_IMAGE: opensuse/15.3 dependencies: - - build/opensuse/15.3 + - build/opensuse/15.3 -upload/opensuse/15.3: +upload/openSUSE/15.3: <<: *upload dependencies: - - build/opensuse/15.3 + - build/opensuse/15.3 diff --git a/icinga-php-library.spec b/icinga-php-library.spec index aa17132..3a879f2 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.8.1 +Version: 0.9.0 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{basedir} %changelog +* Thu Jun 30 2022 Henrik Triem - 0.9.0-1 +- Release 0.9.0 + * Tue Apr 26 2022 Johannes Meyer - 0.8.1-1 - Release 0.8.1 -- GitLab From 94719822fe6df9266a9c9e00198ce5d512901c4d Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Thu, 30 Jun 2022 05:53:49 +0200 Subject: [PATCH 20/22] Release 0.9.0 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52e7fb7..555076f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker - ICINGA_BUILD_TYPE: snapshot - ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly + #ICINGA_BUILD_TYPE: snapshot + #ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly .build: &build stage: build -- GitLab From 79d4be8c98bdd35b858a12c89c56c7e083f71881 Mon Sep 17 00:00:00 2001 From: Henrik Triem Date: Thu, 30 Jun 2022 05:36:29 +0000 Subject: [PATCH 21/22] Set back to snapshot --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 555076f..52e7fb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ stages: variables: DOCKER_IMAGE_BASE: registry.icinga.com/build-docker - #ICINGA_BUILD_TYPE: snapshot - #ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly + ICINGA_BUILD_TYPE: snapshot + ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly .build: &build stage: build -- GitLab From 28d5b0eec43e9bebf75a3737a99b806fc56c1c0a Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 6 Jul 2022 11:14:40 +0200 Subject: [PATCH 22/22] Release 0.9.1-1 (cherry picked from commit a0ce1e994db39efa4a38fa4bfb2a8bdcc9395de5) --- icinga-php-library.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-php-library.spec b/icinga-php-library.spec index 3a879f2..8b22299 100644 --- a/icinga-php-library.spec +++ b/icinga-php-library.spec @@ -4,7 +4,7 @@ %global module_name icinga-php-library Name: %{module_name} -Version: 0.9.0 +Version: 0.9.1 Release: %{revision}%{?dist} Summary: Icinga PHP Library for Icinga Web 2 Group: Applications/System @@ -68,6 +68,9 @@ rm -rf %{buildroot} %{basedir} %changelog +* Wed Jul 06 2022 Johannes Meyer - 0.9.1-1 +- Release 0.9.1 + * Thu Jun 30 2022 Henrik Triem - 0.9.0-1 - Release 0.9.0 -- GitLab