Skip to content

Commit

Permalink
Improve naming of Build Wheels shards
Browse files Browse the repository at this point in the history
Make it more explicit how shard is configured / which wheel building config it has. Whereas for most shards we specify if they run with Py36 vs Py27 in parantheses, it is actually very important we make explicit the wheel building config, as it impacts which wheels we end up producing.
  • Loading branch information
Eric-Arellano committed Feb 17, 2019
1 parent 170e9c8 commit 8d69dc2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ py27_linux_build_wheels_no_ucs: &py27_linux_build_wheels_no_ucs


py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
<<: *py27_linux_build_wheels_no_ucs <<: *py27_linux_build_wheels_no_ucs
name: "Build Linux wheels (Py27 and UCS2 pantsbuild.pants)" name: "Build wheels - Linux and cp27m (UCS2)"
env: env:
- *py27_linux_test_config_env - *py27_linux_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
Expand All @@ -417,7 +417,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4
# Linux defaults to UCS4, so we simply use the pre-installed Python. # Linux defaults to UCS4, so we simply use the pre-installed Python.
<<: *py27_linux_build_wheels_no_ucs <<: *py27_linux_build_wheels_no_ucs
name: "Build Linux wheels (Py27 and UCS4 pantsbuild.pants)" name: "Build wheels - Linux and cp27mu (UCS4)"
env: env:
- *py27_linux_test_config_env - *py27_linux_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
Expand All @@ -440,15 +440,15 @@ py27_osx_build_wheels_no_ucs: &py27_osx_build_wheels_no_ucs
py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2
# OSX defaults to using UCS2, so we simply use the pre-installed Python. # OSX defaults to using UCS2, so we simply use the pre-installed Python.
<<: *py27_osx_build_wheels_no_ucs <<: *py27_osx_build_wheels_no_ucs
name: "Build OSX wheels (Py27 and UCS2 pantsbuild.pants)" name: "Build wheels - OSX and cp27m (UCS2)"
env: env:
- *py27_osx_test_config_env - *py27_osx_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
- CACHE_NAME=osxwheelsbuild.ucs2 - CACHE_NAME=osxwheelsbuild.ucs2


py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4
<<: *py27_osx_build_wheels_no_ucs <<: *py27_osx_build_wheels_no_ucs
name: "Build OSX wheels (Py27 and UCS4 pantsbuild.pants)" name: "Build wheels - OSX and cp27mu (UCS4)"
addons: addons:
brew: brew:
packages: packages:
Expand Down
8 changes: 4 additions & 4 deletions build-support/travis/travis.yml.mustache
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ py27_linux_build_wheels_no_ucs: &py27_linux_build_wheels_no_ucs
py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2 py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
<<: *py27_linux_build_wheels_no_ucs <<: *py27_linux_build_wheels_no_ucs
name: "Build Linux wheels (Py27 and UCS2 pantsbuild.pants)" name: "Build wheels - Linux and cp27m (UCS2)"
env: env:
- *py27_linux_test_config_env - *py27_linux_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
Expand All @@ -396,7 +396,7 @@ py27_linux_build_wheels_ucs2: &py27_linux_build_wheels_ucs2
py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4 py27_linux_build_wheels_ucs4: &py27_linux_build_wheels_ucs4
# Linux defaults to UCS4, so we simply use the pre-installed Python. # Linux defaults to UCS4, so we simply use the pre-installed Python.
<<: *py27_linux_build_wheels_no_ucs <<: *py27_linux_build_wheels_no_ucs
name: "Build Linux wheels (Py27 and UCS4 pantsbuild.pants)" name: "Build wheels - Linux and cp27mu (UCS4)"
env: env:
- *py27_linux_test_config_env - *py27_linux_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
Expand All @@ -419,15 +419,15 @@ py27_osx_build_wheels_no_ucs: &py27_osx_build_wheels_no_ucs
py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2 py27_osx_build_wheels_ucs2: &py27_osx_build_wheels_ucs2
# OSX defaults to using UCS2, so we simply use the pre-installed Python. # OSX defaults to using UCS2, so we simply use the pre-installed Python.
<<: *py27_osx_build_wheels_no_ucs <<: *py27_osx_build_wheels_no_ucs
name: "Build OSX wheels (Py27 and UCS2 pantsbuild.pants)" name: "Build wheels - OSX and cp27m (UCS2)"
env: env:
- *py27_osx_test_config_env - *py27_osx_test_config_env
- *base_build_wheels_env - *base_build_wheels_env
- CACHE_NAME=osxwheelsbuild.ucs2 - CACHE_NAME=osxwheelsbuild.ucs2
py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4 py27_osx_build_wheels_ucs4: &py27_osx_build_wheels_ucs4
<<: *py27_osx_build_wheels_no_ucs <<: *py27_osx_build_wheels_no_ucs
name: "Build OSX wheels (Py27 and UCS4 pantsbuild.pants)" name: "Build wheels - OSX and cp27mu (UCS4)"
addons: addons:
brew: brew:
packages: packages:
Expand Down

0 comments on commit 8d69dc2

Please sign in to comment.