Tarantool development patches archive
 help / color / mirror / Atom feed
From: Kirill Yukhin <kyukhin@tarantool.org>
To: alexander.turenko@tarantool.org
Cc: tarantool-patches@freelists.org, Kirill Yukhin <kyukhin@tarantool.org>
Subject: [tarantool-patches] [PATCH 1/2] build: update rules for extended CI
Date: Thu, 21 Mar 2019 16:25:43 +0300	[thread overview]
Message-ID: <98d9affb350e33124aca9e475f3394e00e5a75fd.1553174240.git.kyukhin@tarantool.org> (raw)
In-Reply-To: <cover.1553174240.git.kyukhin@tarantool.org>

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

  reply	other threads:[~2019-03-21 13:25 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 ` Kirill Yukhin [this message]
2019-03-22  0:44   ` [tarantool-patches] Re: [PATCH 1/2] build: update rules for extended CI 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
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=98d9affb350e33124aca9e475f3394e00e5a75fd.1553174240.git.kyukhin@tarantool.org \
    --to=kyukhin@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [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