From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id C6FFE2AD41
	for <tarantool-patches@freelists.org>; Fri, 22 Mar 2019 11:36:41 -0400 (EDT)
Received: from turing.freelists.org ([127.0.0.1])
	by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id cCDb-FbeNM9o for <tarantool-patches@freelists.org>;
	Fri, 22 Mar 2019 11:36:41 -0400 (EDT)
Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 2FF5A2A4FC
	for <tarantool-patches@freelists.org>; Fri, 22 Mar 2019 11:36:41 -0400 (EDT)
Date: Fri, 22 Mar 2019 18:36:34 +0300
From: Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH 1/2] build: update rules for
 extended CI
Message-ID: <20190322153634.pw4d6ei5kdlwy6ag@tkn_work_nb>
References: <cover.1553174240.git.kyukhin@tarantool.org>
 <98d9affb350e33124aca9e475f3394e00e5a75fd.1553174240.git.kyukhin@tarantool.org>
 <20190322084106.vsxeuoe73ob6wgeh@tarantool.org>
 <20190322115101.lidrvdftwepjlcly@tkn_work_nb>
 <20190322152209.pbae4uofye44jznl@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20190322152209.pbae4uofye44jznl@tarantool.org>
Sender: tarantool-patches-bounce@freelists.org
Errors-to: tarantool-patches-bounce@freelists.org
Reply-To: tarantool-patches@freelists.org
List-Help: <mailto:ecartis@freelists.org?Subject=help>
List-Unsubscribe: <mailto:tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-Subscribe: <mailto:tarantool-patches-request@freelists.org?Subject=subscribe>
List-Owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-Archive: <http://www.freelists.org/archives/tarantool-patches>
To: Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@freelists.org

Looks good.

WBR, Alexander Turenko.

On Fri, Mar 22, 2019 at 06:22:09PM +0300, Kirill Yukhin wrote:
> 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