From da566998504444312d9bf8c2b80971030dc3717e Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Wed, 31 Mar 2021 17:23:01 +0200
Subject: [PATCH] Fix git version
---
.gitlab-ci.yml | 1 +
get_snapshot | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab38aa..d54b002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ variables:
ICINGA_BUILD_TYPE: snapshot
#ICINGA_BUILD_TYPE: release
ICINGA_BUILD_UPSTREAM_BRANCH: nh/build-2.11.6-http-logging-and-sql-programstatus-fixes
+ ICINGA_FORCE_VERSION: v2.11.6-5-gc4ec37ba4
.build: &build
stage: build
diff --git a/get_snapshot b/get_snapshot
index ecd41c2..faa48e4 100755
--- a/get_snapshot
+++ b/get_snapshot
@@ -56,7 +56,7 @@ if [ -z "$UPSTREAM_GIT_NOREPO" ]; then
fi
fi
-git_version=$(git describe --tags "${UPSTREAM_GIT_BRANCH}")
+git_version="v2.11.6-5-gc4ec37ba4"
package_version=$(echo "$git_version" | sed -e 's/^v//' -e 's/-/./g')
tarball="${workdir}/${PROJECT}-${package_version}.tar"
--
GitLab