Tarantool development patches archive
 help / color / mirror / Atom feed
From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@freelists.org
Subject: [tarantool-patches] Re: [PATCH 1/2] build: update rules for extended CI
Date: Fri, 22 Mar 2019 18:36:34 +0300	[thread overview]
Message-ID: <20190322153634.pw4d6ei5kdlwy6ag@tkn_work_nb> (raw)
In-Reply-To: <20190322152209.pbae4uofye44jznl@tarantool.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

  reply	other threads:[~2019-03-22 15:36 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-21 13:25 [tarantool-patches] [PATCH 0/2] build: update rules for master branch Kirill Yukhin
2019-03-21 13:25 ` [tarantool-patches] [PATCH 1/2] build: update rules for extended CI Kirill Yukhin
2019-03-22  0:44   ` [tarantool-patches] " Alexander Turenko
2019-03-22  8:41   ` Kirill Yukhin
2019-03-22 11:51     ` Alexander Turenko
2019-03-22 15:22       ` Kirill Yukhin
2019-03-22 15:36         ` Alexander Turenko [this message]
2019-03-21 13:25 ` [tarantool-patches] [PATCH 2/2] build: set specific name for packages of master branch Kirill Yukhin
2019-03-21 14:09   ` [tarantool-patches] " Kirill Yukhin
2019-03-21 14:21     ` Konstantin Osipov
2019-03-21 15:20       ` Kirill Yukhin

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=20190322153634.pw4d6ei5kdlwy6ag@tkn_work_nb \
    --to=alexander.turenko@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='[tarantool-patches] Re: [PATCH 1/2] build: update rules for extended CI' \
    /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