Set back to snapshot

Release 0.11.0

See merge request packaging/rpm-icinga-php-thirdparty!8

.gitignore

@@ -0,0 +1,12 @@
+## Build
+/build/
+/ccache/
+
+## Snapshot Artifacts
+/*.git/
+/*.tar*
+/*.version
+
+## Editors
+*~
+.*.sw[op]

.gitlab-ci.yml

@@ -5,8 +5,8 @@ stages:
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
-  #ICINGA_BUILD_TYPE: snapshot
+  ICINGA_BUILD_TYPE: snapshot
-  #ICINGA_BUILD_UPSTREAM_BRANCH:
+  ICINGA_BUILD_UPSTREAM_BRANCH: snapshot/nightly
 
 .build: &build
   stage: build
@@ -42,25 +42,8 @@ variables:
   - tags
 
 ###################################
-# EPEL
+# Centos
 ###################################
-build/centos/8:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: centos/8
-
-test/centos/8:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: centos/8
-  dependencies:
-  - build/centos/8
-
-upload/epel/8:
-  <<: *upload
-  dependencies:
-  - build/centos/8
-
 build/centos/7:
   <<: *build
   variables:
@@ -73,7 +56,7 @@ test/centos/7:
   dependencies:
   - build/centos/7
 
-upload/epel/7:
+upload/centos/7:
   <<: *upload
   dependencies:
   - build/centos/7
@@ -81,93 +64,75 @@ upload/epel/7:
 ###################################
 # Fedora
 ###################################
-build/fedora/34:
+build/fedora/36:
   <<: *build
   variables:
-    DOCKER_IMAGE: fedora/34
+    DOCKER_IMAGE: fedora/36
+    RPM_BUILD_NCPUS: '1'
 
-test/fedora/34:
+test/fedora/36:
   <<: *test
   variables:
-    DOCKER_IMAGE: fedora/34
+    DOCKER_IMAGE: fedora/36
   dependencies:
-  - build/fedora/34
+  - build/fedora/36
 
-upload/fedora/34:
+upload/fedora/36:
   <<: *upload
   dependencies:
-  - build/fedora/34
+  - build/fedora/36
 
-build/fedora/33:
+build/fedora/35:
   <<: *build
   variables:
-    DOCKER_IMAGE: fedora/33
+    DOCKER_IMAGE: fedora/35
+    RPM_BUILD_NCPUS: '1'
 
-test/fedora/33:
+test/fedora/35:
   <<: *test
   variables:
-    DOCKER_IMAGE: fedora/33
+    DOCKER_IMAGE: fedora/35
   dependencies:
-  - build/fedora/33
+  - build/fedora/35
 
-upload/fedora/33:
+upload/fedora/35:
   <<: *upload
   dependencies:
-  - build/fedora/33
+  - build/fedora/35
-
-###################################
-# SLES
-###################################
-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
 ###################################
-build/opensuse/15.2:
+build/opensuse/15.4:
   <<: *build
   variables:
-    DOCKER_IMAGE: opensuse/15.2
+    DOCKER_IMAGE: opensuse/15.4
 
-test/opensuse/15.2:
+test/opensuse/15.4:
   <<: *test
   variables:
-    DOCKER_IMAGE: opensuse/15.2
+    DOCKER_IMAGE: opensuse/15.4
   dependencies:
-  - build/opensuse/15.2
+  - build/opensuse/15.4
 
-upload/openSUSE/15.2:
+upload/openSUSE/15.4:
   <<: *upload
   dependencies:
-  - build/opensuse/15.2
+  - 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

get_snapshot

@@ -0,0 +1,87 @@
+#!/bin/bash
+# Copyright (c) 2017 Icinga Development Team <info@icinga.com>
+# 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-thirdparty}
+: ${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"

icinga-php-thirdparty.spec

@@ -1,10 +1,10 @@
 # Icinga PHP Thirdparty for Icinga Web 2 | (c) 2021 Icinga GmbH | GPLv2+
 
-%global revision 1
+%global revision 2
 %global module_name icinga-php-thirdparty
 
 Name:           %{module_name}
-Version:        0.10.0
+Version:        0.11.0
 Release:        %{revision}%{?dist}
 Summary:        Icinga PHP Thirdparty for Icinga Web 2
 Group:          Applications/System
@@ -13,10 +13,36 @@ 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/vendor
 
 Requires:       icinga-php-common
 
+# php extension requirements
+Requires:                   %{php}-soap
+Requires:                   %{php}-sockets
+Requires:                   %{php}-curl
+%{?suse_version:Requires:   %{php}-json}
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
+Requires:                   %{php}-json
+%endif
+
 %description
 This package bundles all 3rd party PHP libraries
 used by Icinga Web products into one piece,
@@ -28,6 +54,7 @@ which can be integrated as library into Icinga Web 2.
 %install
 mkdir -vp %{buildroot}%{basedir}
 
+cp -vr asset %{buildroot}%{basedir}
 cp -vr vendor %{buildroot}%{basedir}
 cp -vr composer.* %{buildroot}%{basedir}
 cp -vr VERSION %{buildroot}%{basedir}
@@ -42,5 +69,11 @@ rm -rf %{buildroot}
 %{basedir}
 
 %changelog
+* Thu Jun 30 2022 Henrik Triem <henrik.triem@icinga.com> - 0.11.0-1
+- Release 0.11.0
+
+* Tue Jul 27 2021 Johannes Meyer <johannes.meyer@icinga.com> - 0.10.0-2
+- Added missing php extension requirements
+
 * Thu Jul 08 2021 Henrik Triem <henrik.triem@icinga.com> - 0.10.0-1
 - Release 0.10.0