[tarantool-patches] Re: [PATCH 1/2] build: update rules for extended CI

[Kirill Yukhin]

Hello,

On 22 Mar 14:51, Alexander Turenko wrote:
> On Fri, Mar 22, 2019 at 11:41:06AM +0300, Kirill Yukhin wrote:
> > Hello,
> > 
> > On 21 Mar 16:25, Kirill Yukhin wrote:
> > > Development branch is now named master, so
> > > update conditions for exetended extended checks on
> > > Travis.
> > > Also, set new repo name.
> > 
> > Fixed typo, set repo to 2_2 and committed to master.
> 
> Tarballs problem is not fixed (see my previous email). 2_2 repository is
> created but CI fails (maybe the push was before the bucket creation).

I'm going to commit this one as well:

diff --git a/.travis.mk b/.travis.mk
index 6e42973..add3826 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -83,8 +83,14 @@ source:
 
 # Push alpha and beta versions to <major>x bucket (say, 2x),
 # stable to <major>.<minor> bucket (say, 2.2).
-MAJOR_VERSION=$(word 1,$(subst ., ,$(TRAVIS_BRANCH)))
-MINOR_VERSION=$(word 2,$(subst ., ,$(TRAVIS_BRANCH)))
+ifeq ($(TRAVIS_BRANCH),master)
+	GIT_DESCRIBE := $(shell git describe HEAD)
+	MAJOR_VERSION=$(word 1,$(subst ., ,${GIT_DESCRIBE}))
+	MINOR_VERSION=$(word 2,$(subst ., ,${GIT_DESCRIBE}))
+else
+	MAJOR_VERSION=$(word 1,$(subst ., ,$(TRAVIS_BRANCH)))
+	MINOR_VERSION=$(word 2,$(subst ., ,$(TRAVIS_BRANCH)))
+endif
 BUCKET=tarantool.$(MAJOR_VERSION).$(MINOR_VERSION).src
 ifeq ($(MINOR_VERSION),0)
 BUCKET=tarantool.$(MAJOR_VERSION)x.src

--
Regards, Kirill Yukhin