From 7da092b18b7108418edc4ad5eb96c7ffef2e3efd Mon Sep 17 00:00:00 2001 From: Eric Arellano Date: Tue, 19 Feb 2019 17:03:59 -0700 Subject: [PATCH] Fix platform default shards bootstrapping - OSX UCS2 shard no longer was setting RUN_PANTS_FROM_PEX anywhere - Linux UCS4 had its before_script entry being override by travis_image. --- .travis.yml | 4 ++-- build-support/travis/travis.yml.mustache | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21dcc799feb..f8a8066ee21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -415,8 +415,8 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 sh -c "./build-support/bin/ci.sh -2b && RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n" py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 - <<: *py27_linux_test_config <<: *py27_linux_build_wheels_no_ucs + <<: *py27_linux_test_config name: "Build wheels - Linux and cp27mu (UCS4)" env: - *py27_linux_test_config_env @@ -443,7 +443,7 @@ py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 - *base_build_wheels_env - CACHE_NAME=osxwheelsbuild.ucs2 script: - - ./build-support/bin/release.sh -n + - RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 <<: *py27_osx_config diff --git a/build-support/travis/travis.yml.mustache b/build-support/travis/travis.yml.mustache index bdfab306abe..f4dd20f0371 100644 --- a/build-support/travis/travis.yml.mustache +++ b/build-support/travis/travis.yml.mustache @@ -394,8 +394,8 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 sh -c "./build-support/bin/ci.sh -2b && RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n" py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 - <<: *py27_linux_test_config <<: *py27_linux_build_wheels_no_ucs + <<: *py27_linux_test_config name: "Build wheels - Linux and cp27mu (UCS4)" env: - *py27_linux_test_config_env @@ -422,7 +422,7 @@ py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 - *base_build_wheels_env - CACHE_NAME=osxwheelsbuild.ucs2 script: - - ./build-support/bin/release.sh -n + - RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 <<: *py27_osx_config