Skip to content
Permalink
Browse files

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.
  • Loading branch information...
Eric-Arellano committed Feb 20, 2019
1 parent 38e1cf7 commit 7da092b18b7108418edc4ad5eb96c7ffef2e3efd
Showing with 4 additions and 4 deletions.
  1. +2 −2 .travis.yml
  2. +2 −2 build-support/travis/travis.yml.mustache
@@ -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
@@ -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

0 comments on commit 7da092b

Please sign in to comment.
You can’t perform that action at this time.