[tarantool-patches] [PATCH 0/2] build: update rules for master branch

[tarantool-patches] [PATCH 0/2] build: update rules for master branch

[Kirill Yukhin]

This patch set fixes checks for CI and sets specific
name for master branch.

Branch: https://github.com/tarantool/tarantool/commits/kyukhin/update-ci-for-master
Issue: N/A

Kirill Yukhin (2):
  build: update rules for extended CI
  build: set specific name for packages of master branch

 .travis.yml    | 38 +++++++++++++++++++-------------------
 CMakeLists.txt | 10 +++++++++-
 2 files changed, 28 insertions(+), 20 deletions(-)

-- 
2.19.1

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

[Kirill Yukhin]

Development branch is now named master, so
update conditions for exetended extended checks on
Travis.
Also, set new repo name.
---
 .travis.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1ff5a8..b79ba18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,54 +33,54 @@ jobs:
         env: TARGET=test
         os: osx
         osx_image: xcode9.4
-        if: branch = "2.1"
+        if: branch = "master"
       - name: LTO build + test (Linux, gcc)
         env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
-        if: branch = "2.1"
+        if: branch = "master"
       - name: LTO build + test (Linux, clang)
         env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
-        if: branch = "2.1"
+        if: branch = "master"
         compiler: clang
       - name: LTO build + test (OS X Mojave 10.14)
         os: osx
         env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Create and deploy tarball
         env: TARGET=source
-        if: branch = "2.1"
+        if: branch = "master"
       - name: CentOS 6 build + test + deploy RPM
         env: OS=el DIST=6
-        if: branch = "2.1"
+        if: branch = "master"
       - name: CentOS 7 build + test + deploy RPM
         env: OS=el DIST=7
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Fedora 28 build + test + deploy RPM
         env: OS=fedora DIST=28
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Fedora 29 build + test + deploy RPM
         env: OS=fedora DIST=29
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Ubuntu Trusty (14.04) build + deploy DEB
         env: OS=ubuntu DIST=trusty
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Ubuntu Xenial (16.04) build + deploy DEB
         env: OS=ubuntu DIST=xenial
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Ubuntu Bionic (18.04) build + deploy DEB
         env: OS=ubuntu DIST=bionic
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Ubuntu Cosmic (18.10) build + deploy DEB
         env: OS=ubuntu DIST=cosmic
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Debian Wheezy (7) build + deploy DEB
         env: OS=debian DIST=wheezy
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Debian Jessie (8) build + deploy DEB
         env: OS=debian DIST=jessie
-        if: branch = "2.1"
+        if: branch = "master"
       - name: Debian Stretch (9) build + deploy DEB
         env: OS=debian DIST=stretch
-        if: branch = "2.1"
+        if: branch = "master"
 
 script:
   - make -f .travis.mk ${TARGET}
@@ -92,14 +92,14 @@ deploy:
   # Deploy packages to PackageCloud
   - provider: packagecloud
     username: "tarantool"
-    repository: "2x"
+    repository: "master"
     token: "${PACKAGECLOUD_TOKEN}"
     dist: "${OS}/${DIST}"
     package_glob: build/*.{rpm,deb,dsc}
     skip_cleanup: true
     on:
       repo: tarantool/tarantool
-      branch: "2.1"
+      branch: "master"
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
   # Deploy source tarballs to S3
   - provider: script
@@ -107,7 +107,7 @@ deploy:
     skip_cleanup: true
     on:
       repo: tarantool/tarantool
-      branch: "2.1"
+      branch: "master"
       condition: "x${TARGET} = xsource"
 
 notifications:
-- 
2.19.1

[tarantool-patches] [PATCH 2/2] build: set specific name for packages of master branch

[Kirill Yukhin]

To make Linux package managers happy, set major version
number for master branch to 9999, so it will be always
freshest one.
---
 CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7658fc6..dbe5847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,8 +171,16 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND GIT)
         OUTPUT_STRIP_TRAILING_WHITESPACE
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
+    execute_process (COMMAND ${GIT} rev-parse --abbrev-ref HEAD
+        OUTPUT_VARIABLE TARANTOOL_GIT_BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
     if (NOT ("${TARANTOOL_GIT_VERSION}" STREQUAL "${TARANTOOL_VERSION}"))
-        set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}")
+        if ("${TARANTOOL_GIT_BRANCH}" STREQUAL "master")
+            set (TARANTOOL_VERSION "9999.${TARANTOOL_GIT_VERSION}")
+        else()
+            set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}")
+        endif()
         message(STATUS "Generating VERSION file")
         file(WRITE ${VERSION_FILE} "${TARANTOOL_VERSION}\n")
 
-- 
2.19.1

[tarantool-patches] Re: [PATCH 2/2] build: set specific name for packages of master branch

[Kirill Yukhin]

Hello,

We need to update a test as well. Branch force-pushed.

On 21 Mar 16:25, Kirill Yukhin wrote:
> To make Linux package managers happy, set major version
> number for master branch to 9999, so it will be always
> freshest one.
> ---
>  CMakeLists.txt | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 7658fc6..dbe5847 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -171,8 +171,16 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND GIT)
>          OUTPUT_STRIP_TRAILING_WHITESPACE
>          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
>  
> +    execute_process (COMMAND ${GIT} rev-parse --abbrev-ref HEAD
> +        OUTPUT_VARIABLE TARANTOOL_GIT_BRANCH
> +        OUTPUT_STRIP_TRAILING_WHITESPACE
> +        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
>      if (NOT ("${TARANTOOL_GIT_VERSION}" STREQUAL "${TARANTOOL_VERSION}"))
> -        set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}")
> +        if ("${TARANTOOL_GIT_BRANCH}" STREQUAL "master")
> +            set (TARANTOOL_VERSION "9999.${TARANTOOL_GIT_VERSION}")
> +        else()
> +            set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}")
> +        endif()
>          message(STATUS "Generating VERSION file")
>          file(WRITE ${VERSION_FILE} "${TARANTOOL_VERSION}\n")
>  
> -- 
> 2.19.1
> 
diff --git a/test/box-py/args.result b/test/box-py/args.result
index 54629ed..426d67b 100644
--- a/test/box-py/args.result
+++ b/test/box-py/args.result
@@ -44,7 +44,7 @@ tarantool --no-such-option --version
 tarantool: unrecognized option
 
 tarantool --version
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 9999.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
 Compiler: cc
@@ -52,7 +52,7 @@ C_FLAGS: flags
 CXX_FLAGS: flags
 
 tarantool -v
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 9999.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
 Compiler: cc
@@ -60,7 +60,7 @@ C_FLAGS: flags
 CXX_FLAGS: flags
 
 tarantool -V
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 9999.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
 Compiler: cc
@@ -111,7 +111,7 @@ arg[3] => 2
 arg[4] => 3
 
 tarantool -V ${SOURCEDIR}/test/box-py/args.lua 1 2 3
-Tarantool 2.minor.patch-<rev>-<commit>
+Tarantool 9999.minor.patch-<rev>-<commit>
 Target: platform <build>
 Build options: flags
 Compiler: cc

--
Regards, Kirill Yukhin

[tarantool-patches] Re: [PATCH 2/2] build: set specific name for packages of master branch

[Konstantin Osipov]

* Kirill Yukhin <kyukhin@tarantool.org> [19/03/21 17:14]:
>  tarantool --version
> -Tarantool 2.minor.patch-<rev>-<commit>
> +Tarantool 9999.minor.patch-<rev>-<commit>

Replication looks at this number when it checks compatibility of
slave and master. It will break after this change - get confused
by a too large master number running in production.

Schema versioning is also looking at this number and schema
upgrade executes only if the current tarantool schema version is
smaller than the binary version. It is not looking at the number
explicitly, but still.

I'm almost certain many modules look at this number to check
server capabilities and compatibility.

By making this change you effectively rendered the master branch
unusable to the community.

There is not a single reason for this decision except "others are
doing it this way".

-- 
Konstantin Osipov, Moscow, Russia, +7 903 626 22 32
http://tarantool.io - www.twitter.com/kostja_osipov

[tarantool-patches] Re: [PATCH 2/2] build: set specific name for packages of master branch

[Kirill Yukhin]

Hello,

On 21 Mar 17:21, Konstantin Osipov wrote:
> * Kirill Yukhin <kyukhin@tarantool.org> [19/03/21 17:14]:
> >  tarantool --version
> > -Tarantool 2.minor.patch-<rev>-<commit>
> > +Tarantool 9999.minor.patch-<rev>-<commit>
> 
> Schema versioning is also looking at this number and schema
> upgrade executes only if the current tarantool schema version is
> smaller than the binary version. It is not looking at the number
> explicitly, but still.

Schema upgrade is a seriuos concern. Let's don't do it.

--
Regards, Kirill Yukhin

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

[Alexander Turenko]

Okay for the branch name update in jobs / deploy conditions.

The packagecloud repository need to be changed from 2x to 2_2 (not
master, according to your decision after Konstantin O. comments).

S3 bucket name for tarballs is automatically setup from a branch name in
.travis.mk (see at almost end of the file). Now it will be broken, so
maybe you need to implement git describe parsing here instead of using
branch name.

I created tarantool.2.2.src bucket on our s3 and setup needed
parameters.

Please, ask Konstantin O. for the new repository on packagecloud (I
cannot do it).

WBR, Alexander Turenko.

On Thu, Mar 21, 2019 at 04:25:43PM +0300, Kirill Yukhin wrote:
> Development branch is now named master, so
> update conditions for exetended extended checks on

Typo: 'for exetended extended checks'.

> Travis.
> Also, set new repo name.
> ---
>  .travis.yml | 38 +++++++++++++++++++-------------------
>  1 file changed, 19 insertions(+), 19 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index d1ff5a8..b79ba18 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -33,54 +33,54 @@ jobs:
>          env: TARGET=test
>          os: osx
>          osx_image: xcode9.4
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: LTO build + test (Linux, gcc)
>          env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: LTO build + test (Linux, clang)
>          env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
> -        if: branch = "2.1"
> +        if: branch = "master"
>          compiler: clang
>        - name: LTO build + test (OS X Mojave 10.14)
>          os: osx
>          env: TARGET=test CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Create and deploy tarball
>          env: TARGET=source
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: CentOS 6 build + test + deploy RPM
>          env: OS=el DIST=6
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: CentOS 7 build + test + deploy RPM
>          env: OS=el DIST=7
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Fedora 28 build + test + deploy RPM
>          env: OS=fedora DIST=28
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Fedora 29 build + test + deploy RPM
>          env: OS=fedora DIST=29
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Ubuntu Trusty (14.04) build + deploy DEB
>          env: OS=ubuntu DIST=trusty
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Ubuntu Xenial (16.04) build + deploy DEB
>          env: OS=ubuntu DIST=xenial
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Ubuntu Bionic (18.04) build + deploy DEB
>          env: OS=ubuntu DIST=bionic
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Ubuntu Cosmic (18.10) build + deploy DEB
>          env: OS=ubuntu DIST=cosmic
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Debian Wheezy (7) build + deploy DEB
>          env: OS=debian DIST=wheezy
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Debian Jessie (8) build + deploy DEB
>          env: OS=debian DIST=jessie
> -        if: branch = "2.1"
> +        if: branch = "master"
>        - name: Debian Stretch (9) build + deploy DEB
>          env: OS=debian DIST=stretch
> -        if: branch = "2.1"
> +        if: branch = "master"
>  
>  script:
>    - make -f .travis.mk ${TARGET}
> @@ -92,14 +92,14 @@ deploy:
>    # Deploy packages to PackageCloud
>    - provider: packagecloud
>      username: "tarantool"
> -    repository: "2x"
> +    repository: "master"
>      token: "${PACKAGECLOUD_TOKEN}"
>      dist: "${OS}/${DIST}"
>      package_glob: build/*.{rpm,deb,dsc}
>      skip_cleanup: true
>      on:
>        repo: tarantool/tarantool
> -      branch: "2.1"
> +      branch: "master"
>        condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
>    # Deploy source tarballs to S3
>    - provider: script
> @@ -107,7 +107,7 @@ deploy:
>      skip_cleanup: true
>      on:
>        repo: tarantool/tarantool
> -      branch: "2.1"
> +      branch: "master"
>        condition: "x${TARGET} = xsource"
>  
>  notifications:
> -- 
> 2.19.1
> 

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

[Kirill Yukhin]

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.

--
Regards, Kirill Yukhin

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

[Alexander Turenko]

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).

download.tarantoo.io is not set up to redirect to packagecloud.

> 
> --
> Regards, Kirill Yukhin
> 

[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

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

[Alexander Turenko]

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