From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 2FCF62A7C8 for ; Thu, 21 Mar 2019 09:25:53 -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 JSjFCWY6Z0Sb for ; Thu, 21 Mar 2019 09:25:53 -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 C45F72A7C4 for ; Thu, 21 Mar 2019 09:25:52 -0400 (EDT) From: Kirill Yukhin Subject: [tarantool-patches] [PATCH 1/2] build: update rules for extended CI Date: Thu, 21 Mar 2019 16:25:43 +0300 Message-Id: <98d9affb350e33124aca9e475f3394e00e5a75fd.1553174240.git.kyukhin@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: alexander.turenko@tarantool.org Cc: tarantool-patches@freelists.org, 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