From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp62.i.mail.ru (smtp62.i.mail.ru [217.69.128.42])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id 7277B469719
 for <tarantool-patches@dev.tarantool.org>;
 Fri,  9 Oct 2020 02:13:56 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Fri,  9 Oct 2020 02:13:52 +0300
Message-Id: <029eade3955655f76ee90125ba61726780307a82.1602198773.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v1] packages: tagged commit force push
	to live repo
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Kirill Yukhin <kyukhin@tarantool.org>, Leonid Vasiliev <lvasiliev@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko <alexander.turenko@tarantool.org>

If the commit tagged, then push packages to 'live' repository with force
push '-f -s' flags to be sure that if occasionaly the commit before current
commit pushed packages with the current branch naming then the current push
won't fail on it and will push the packages to the release repository after.

Closes #3745
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-3745-force-push-live
Issue: https://github.com/tarantool/tarantool/issues/3745

 .gitlab.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab.mk b/.gitlab.mk
index e1a83ac07..808288f23 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -120,11 +120,18 @@ package: deploy_prepare
 
 deploy: package
 	echo ${GPG_SECRET_KEY} | base64 -d | gpg --batch --import || true
-	./tools/update_repo.sh -o=${OS} -d=${DIST} \
-		-b="${LIVE_REPO_S3_DIR}/${BUCKET}" build
+	# If the commit tagged, then push packages to 'live' repository with force
+	# push '-f -s' flags to be sure that if occasionaly the commit before current
+	# commit pushed packages with the current branch naming then the current push
+	# won't fail on it and will push the packages to the release repository after.
 	if [ "${CI_COMMIT_TAG}" != "" ]; then \
+		./tools/update_repo.sh -o=${OS} -d=${DIST} \
+			-b="${LIVE_REPO_S3_DIR}/${BUCKET}" -f -s build ; \
 		./tools/update_repo.sh -o=${OS} -d=${DIST} \
 			-b="${RELEASE_REPO_S3_DIR}/${BUCKET}" build ; \
+	else \
+		./tools/update_repo.sh -o=${OS} -d=${DIST} \
+			-b="${LIVE_REPO_S3_DIR}/${BUCKET}" build ; \
 	fi
 
 source: deploy_prepare
-- 
2.25.1