Skip to content

Commit

Permalink
release.sh still needs to run from PEX
Browse files Browse the repository at this point in the history
Change how we handle env var to not use PEX when first bootstrapping, then use it in the followup release.sh command.
  • Loading branch information
Eric-Arellano committed Feb 19, 2019
1 parent dc36d94 commit 513cd50
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ cargo_audit: &cargo_audit
base_build_wheels: &base_build_wheels
stage: *test
env:
- &base_build_wheels_env RUN_PANTS_FROM_PEX=1 PREPARE_DEPLOY=1
- &base_build_wheels_env PREPARE_DEPLOY=1

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
Expand All @@ -401,7 +401,6 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
env:
- *py27_linux_test_config_env
- *base_build_wheels_env
- RUN_PANTS_FROM_PEX=0
- CACHE_NAME=linuxwheelsbuild.ucs2
script:
- docker build --rm -t travis_ci_py27_ucs2
Expand All @@ -414,7 +413,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
-v "${HOME}:/travis/home"
-v "${TRAVIS_BUILD_DIR}:/travis/workdir"
travis_ci_py27_ucs2:latest
sh -c "./build-support/bin/ci.sh -2b && ./build-support/bin/release.sh -n"
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_build_wheels_no_ucs
Expand Down Expand Up @@ -461,7 +460,6 @@ py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_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}"

- PYTHON_CONFIGURE_OPTS=--enable-unicode=ucs4
- RUN_PANTS_FROM_PEX=0
before_install:
- curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-osx-amd64 -o /usr/local/bin/jq
- chmod 755 /usr/local/bin/jq
Expand All @@ -470,8 +468,8 @@ py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4
- ${PYENV_ROOT}/bin/pyenv install 2.7.13
- ${PYENV_ROOT}/bin/pyenv global 2.7.13
script:
- ./build-support/bin/ci.sh -2b
- ./build-support/bin/release.sh -n
- RUN_PANTS_FROM_PEX=0 ./build-support/bin/ci.sh -2b
- RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n

# -------------------------------------------------------------------------
# Rust tests
Expand Down
10 changes: 4 additions & 6 deletions build-support/travis/travis.yml.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ cargo_audit: &cargo_audit
base_build_wheels: &base_build_wheels
stage: *test
env:
- &base_build_wheels_env RUN_PANTS_FROM_PEX=1 PREPARE_DEPLOY=1
- &base_build_wheels_env PREPARE_DEPLOY=1
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
Expand All @@ -380,7 +380,6 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
env:
- *py27_linux_test_config_env
- *base_build_wheels_env
- RUN_PANTS_FROM_PEX=0
- CACHE_NAME=linuxwheelsbuild.ucs2
script:
- docker build --rm -t travis_ci_py27_ucs2
Expand All @@ -393,7 +392,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
-v "${HOME}:/travis/home"
-v "${TRAVIS_BUILD_DIR}:/travis/workdir"
travis_ci_py27_ucs2:latest
sh -c "./build-support/bin/ci.sh -2b && ./build-support/bin/release.sh -n"
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_build_wheels_no_ucs
Expand Down Expand Up @@ -439,15 +438,14 @@ py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4
- CACHE_NAME=osxwheelsbuild.ucs4
- {{>env_osx_with_pyenv}}
- PYTHON_CONFIGURE_OPTS=--enable-unicode=ucs4
- RUN_PANTS_FROM_PEX=0
before_install:
{{>before_install_osx}}
- git clone https://github.com/pyenv/pyenv ${PYENV_ROOT}
- ${PYENV_ROOT}/bin/pyenv install 2.7.13
- ${PYENV_ROOT}/bin/pyenv global 2.7.13
script:
- ./build-support/bin/ci.sh -2b
- ./build-support/bin/release.sh -n
- RUN_PANTS_FROM_PEX=0 ./build-support/bin/ci.sh -2b
- RUN_PANTS_FROM_PEX=1 ./build-support/bin/release.sh -n
# -------------------------------------------------------------------------
# Rust tests
Expand Down

0 comments on commit 513cd50

Please sign in to comment.