From ae4c1bdbb0bbfc6779e4ad7bde3ee22f3abc40de Mon Sep 17 00:00:00 2001
From: Eric Arellano <14852634+Eric-Arellano@users.noreply.github.com>
Date: Mon, 27 Jul 2020 21:40:12 -0700
Subject: [PATCH] Only skip building wheels on PR builds (#10482)

Building on all branch builds has the following benefits:
1) We'll detect the release process breaking before the day of a release.
2) Downstream users can consume any arbitrary Pants commit.

[ci skip-rust]
---
 .travis.yml                              | 6 ++++--
 build-support/bin/generate_travis_yml.py | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5144fac07b4..55c5d38614b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -615,7 +615,8 @@ jobs:
     - PANTS_REMOTE_CA_CERTS_PATH=/usr/lib/google-cloud-sdk/lib/third_party/grpc/_cython/_credentials/roots.pem
     - PREPARE_DEPLOY=1
     - CACHE_NAME=wheels.linux
-    if: commit_message !~ /\[ci skip-build-wheels\]/
+    if: commit_message !~ /\[ci skip-build-wheels\]/ OR type NOT IN (pull_request,
+      cron)
     language: python
     name: Build Linux wheels and fs_util
     os: linux
@@ -668,7 +669,8 @@ jobs:
     - BOOTSTRAPPED_PEX_KEY_SUFFIX=py36.osx
     - PREPARE_DEPLOY=1
     - CACHE_NAME=wheels.osx
-    if: commit_message !~ /\[ci skip-build-wheels\]/
+    if: commit_message !~ /\[ci skip-build-wheels\]/ OR type NOT IN (pull_request,
+      cron)
     language: generic
     name: Build macOS wheels and fs_util
     os: osx
diff --git a/build-support/bin/generate_travis_yml.py b/build-support/bin/generate_travis_yml.py
index 5c5cfe1529c..0c5671f2ac0 100644
--- a/build-support/bin/generate_travis_yml.py
+++ b/build-support/bin/generate_travis_yml.py
@@ -436,7 +436,9 @@ def osx_shard(
 
 # See https://docs.travis-ci.com/user/conditions-v1.
 SKIP_RUST_CONDITION = r"commit_message !~ /\[ci skip-rust\]/"
-SKIP_WHEELS_CONDITION = r"commit_message !~ /\[ci skip-build-wheels\]/"
+SKIP_WHEELS_CONDITION = (
+    r"commit_message !~ /\[ci skip-build-wheels\]/ OR type NOT IN (pull_request, cron)"
+)
 
 # ----------------------------------------------------------------------
 # Bootstrap engine