Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Kirill Yukhin <kyukhin@tarantool.org>,
	Leonid Vasiliev <lvasiliev@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org,
	Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [Tarantool-patches] [PATCH v1] packages: tagged commit force push to live repo
Date: Fri,  9 Oct 2020 02:13:52 +0300	[thread overview]
Message-ID: <029eade3955655f76ee90125ba61726780307a82.1602198773.git.avtikhon@tarantool.org> (raw)

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

             reply	other threads:[~2020-10-08 23:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-08 23:13 Alexander V. Tikhonov [this message]
2020-10-14  2:42 ` Alexander Turenko
2020-10-14 21:06   ` Alexander V. Tikhonov
2020-10-14 23:32     ` Alexander Turenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=029eade3955655f76ee90125ba61726780307a82.1602198773.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=lvasiliev@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1] packages: tagged commit force push to live repo' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox