From 0da5f91c703b7f1df18c58e907d73050972e44ab Mon Sep 17 00:00:00 2001 From: Eric Arellano Date: Tue, 19 Feb 2019 15:13:11 -0700 Subject: [PATCH] Stop pulling down PEX Use the {osx,linux}_config images rather than {osx,linux}_test_config images. --- .travis.yml | 10 ++++++---- build-support/travis/travis.yml.mustache | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f60b25ba45..3312c64388e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -391,15 +391,15 @@ py27_linux_build_wheels_no_ucs: &py27_linux_build_wheels_no_ucs # Similar to the bootstrap shard, we build Linux wheels in a docker image to maximize # compatibility. This is a Py2.7 shard, so it is not subject to #6985. <<: *travis_docker_image - <<: *py27_linux_test_config <<: *base_build_wheels py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 + <<: *py27_linux_config <<: *py27_linux_build_wheels_no_ucs <<: *native_engine_cache_config name: "Build wheels - Linux and cp27m (UCS2)" env: - - *py27_linux_test_config_env + - *py27_linux_config_env - *base_build_wheels_env - CACHE_NAME=linuxwheelsbuild.ucs2 script: @@ -416,6 +416,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 sh -c "RUN_PANTS_FROM_PEX=0 ./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 name: "Build wheels - Linux and cp27mu (UCS4)" env: @@ -431,11 +432,11 @@ py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 sh -c "RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n" py27_osx_build_wheels_no_ucs: &py27_osx_build_wheels_no_ucs - <<: *py27_osx_test_config <<: *base_build_wheels osx_image: xcode8 py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 + <<: *py27_osx_test_config <<: *py27_osx_build_wheels_no_ucs name: "Build wheels - OSX and cp27m (UCS2)" env: @@ -446,6 +447,7 @@ py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 - ./build-support/bin/release.sh -n py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 + <<: *py27_osx_config <<: *py27_osx_build_wheels_no_ucs <<: *native_engine_cache_config name: "Build wheels - OSX and cp27mu (UCS4)" @@ -454,7 +456,7 @@ py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 packages: - openssl env: - - *py27_osx_test_config_env + - *py27_osx_config_env - *base_build_wheels_env - CACHE_NAME=osxwheelsbuild.ucs4 - PATH="/usr/local/opt/openssl/bin:$PATH" LDFLAGS="-L/usr/local/opt/openssl/lib" CPPFLAGS="-I/usr/local/opt/openssl/include" PYENV_ROOT="${HOME}/.pyenv" PATH="${PYENV_ROOT}/shims:${PATH}" diff --git a/build-support/travis/travis.yml.mustache b/build-support/travis/travis.yml.mustache index 70e257dbcdf..1930c505ce0 100644 --- a/build-support/travis/travis.yml.mustache +++ b/build-support/travis/travis.yml.mustache @@ -370,15 +370,15 @@ py27_linux_build_wheels_no_ucs: &py27_linux_build_wheels_no_ucs # Similar to the bootstrap shard, we build Linux wheels in a docker image to maximize # compatibility. This is a Py2.7 shard, so it is not subject to #6985. <<: *travis_docker_image - <<: *py27_linux_test_config <<: *base_build_wheels py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 + <<: *py27_linux_config <<: *py27_linux_build_wheels_no_ucs <<: *native_engine_cache_config name: "Build wheels - Linux and cp27m (UCS2)" env: - - *py27_linux_test_config_env + - *py27_linux_config_env - *base_build_wheels_env - CACHE_NAME=linuxwheelsbuild.ucs2 script: @@ -395,6 +395,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 sh -c "RUN_PANTS_FROM_PEX=0 ./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 name: "Build wheels - Linux and cp27mu (UCS4)" env: @@ -410,11 +411,11 @@ py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 sh -c "RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n" py27_osx_build_wheels_no_ucs: &py27_osx_build_wheels_no_ucs - <<: *py27_osx_test_config <<: *base_build_wheels osx_image: xcode8 py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 + <<: *py27_osx_test_config <<: *py27_osx_build_wheels_no_ucs name: "Build wheels - OSX and cp27m (UCS2)" env: @@ -425,6 +426,7 @@ py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 - ./build-support/bin/release.sh -n py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 + <<: *py27_osx_config <<: *py27_osx_build_wheels_no_ucs <<: *native_engine_cache_config name: "Build wheels - OSX and cp27mu (UCS4)" @@ -433,7 +435,7 @@ py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 packages: - openssl env: - - *py27_osx_test_config_env + - *py27_osx_config_env - *base_build_wheels_env - CACHE_NAME=osxwheelsbuild.ucs4 - {{>env_osx_with_pyenv}}