From 7728a4517b7d8a28d06093e048936dab725a0507 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Mon, 17 Aug 2020 15:07:54 +0200
Subject: [PATCH] icinga-build-deb-source: Skip uscan entirely if there's a
tarball
---
icinga-build-deb-source | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/icinga-build-deb-source b/icinga-build-deb-source
index 481f18d..29239ed 100755
--- a/icinga-build-deb-source
+++ b/icinga-build-deb-source
@@ -45,12 +45,12 @@ if [ "${ICINGA_BUILD_TYPE}" == "release" ] ; then
(
set -ex
- if [ "${USCAN_DOWNLOAD}" == "no" ]; then
+ if [ "${CI_SKIP_USCAN}" == "yes" ]; then
cp ./*.tar* "${BUILDDIR}/"
+ else
+ cd "${BUILDDIR}/${ICINGA_BUILD_PROJECT}"
+ run-retry-timeout uscan --download-current-version --verbose
fi
-
- cd "${BUILDDIR}/${ICINGA_BUILD_PROJECT}"
- run-retry-timeout uscan --download-current-version --verbose
)
else
(
--
GitLab