You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2018/07/21 16:46:16 UTC

[arrow] branch master updated: ARROW-2877: [Packaging] crossbow submit results in duplicate Travis CI build

This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b74592  ARROW-2877: [Packaging] crossbow submit results in duplicate Travis CI build
4b74592 is described below

commit 4b745923118a8ddec5321f72c37cab89976f9866
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Sat Jul 21 18:46:10 2018 +0200

    ARROW-2877: [Packaging] crossbow submit results in duplicate Travis CI build
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #2296 from kszucs/ARROW-2877 and squashes the following commits:
    
    4832965d <Krisztián Szűcs> set tag is blank condition for travis builds
---
 dev/tasks/conda-recipes/travis.linux.yml  |  6 ++++--
 dev/tasks/conda-recipes/travis.osx.yml    |  6 ++++--
 dev/tasks/linux-packages/travis.linux.yml |  3 +++
 dev/tasks/python-wheels/travis.linux.yml  | 17 ++++++++++-------
 dev/tasks/python-wheels/travis.osx.yml    |  6 ++++--
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/dev/tasks/conda-recipes/travis.linux.yml b/dev/tasks/conda-recipes/travis.linux.yml
index dcf0c42..c0fc71d 100644
--- a/dev/tasks/conda-recipes/travis.linux.yml
+++ b/dev/tasks/conda-recipes/travis.linux.yml
@@ -15,10 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-language: generic
-
 os: linux
 dist: trusty
+language: generic
+
+# don't build twice
+if: tag IS blank
 
 env:
   global:
diff --git a/dev/tasks/conda-recipes/travis.osx.yml b/dev/tasks/conda-recipes/travis.osx.yml
index d92c19d..193539d 100644
--- a/dev/tasks/conda-recipes/travis.osx.yml
+++ b/dev/tasks/conda-recipes/travis.osx.yml
@@ -15,10 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-language: generic
-
 os: osx
 osx_image: xcode6.4
+language: generic
+
+# don't build twice
+if: tag IS blank
 
 env:
   global:
diff --git a/dev/tasks/linux-packages/travis.linux.yml b/dev/tasks/linux-packages/travis.linux.yml
index 1f9bbb5..d5b2889 100644
--- a/dev/tasks/linux-packages/travis.linux.yml
+++ b/dev/tasks/linux-packages/travis.linux.yml
@@ -20,6 +20,9 @@ dist: trusty
 sudo: required
 language: ruby
 
+# don't build twice
+if: tag IS blank
+
 env:
   global:
     - PLAT=x86_64
diff --git a/dev/tasks/python-wheels/travis.linux.yml b/dev/tasks/python-wheels/travis.linux.yml
index bdc4f02..8ee82d4 100644
--- a/dev/tasks/python-wheels/travis.linux.yml
+++ b/dev/tasks/python-wheels/travis.linux.yml
@@ -14,6 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+os: linux
+dist: trusty
+sudo: required
+language: cpp
+services:
+  - docker
+
+# don't build twice
+if: tag IS blank
+
 env:
   global:
     - PLAT=x86_64
@@ -22,13 +32,6 @@ env:
     - PYTHON_VERSION={{ python_version }}
     - PYARROW_VERSION={{ arrow.version }}
 
-os: linux
-dist: trusty
-sudo: required
-language: cpp
-services:
-  - docker
-
 before_script:
   - docker pull quay.io/xhochy/arrow_manylinux1_x86_64_base:latest
 
diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml
index 9f58c24..7b22b1c 100644
--- a/dev/tasks/python-wheels/travis.osx.yml
+++ b/dev/tasks/python-wheels/travis.osx.yml
@@ -14,10 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-language: generic
-
 os: osx
 osx_image: xcode8.3
+language: generic
+
+# don't build twice
+if: tag IS blank
 
 env:
   global: