Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

When building a pex in release.sh, build it for all supported ABIs. #7393

Merged
merged 2 commits into from
Mar 15, 2019
Merged

When building a pex in release.sh, build it for all supported ABIs. #7393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f0752
When building a pex in release.sh, build it for all supported ABIs.
stuhood Mar 15, 2019
5daf3bc
Add comment.
Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions build-support/bin/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,29 +569,37 @@ function build_pex() {
# If $1 == "fetch", fetches the linux and OSX wheels which were built on travis.
local mode="$1"

local linux_platform="linux_x86_64"
local osx_platform="macosx_10.11_x86_64"
local linux_platform_noabi="linux_x86_64"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit

Suggested change
local linux_platform_noabi="linux_x86_64"
local linux_platform_no_abi="linux_x86_64"

local osx_platform_noabi="macosx_10.11_x86_64"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit

Suggested change
local osx_platform_noabi="macosx_10.11_x86_64"
local osx_platform_no_abi="macosx_10.11_x86_64"


case "${mode}" in
build)
case "$(uname)" in
Darwin)
local platform="${osx_platform}"
;;
Linux)
local platform="${linux_platform}"
;;
*)
echo >&2 "Unknown uname"
exit 1
;;
# NB: When building locally, we use a platform that does not refer to the ABI version, to
# avoid needing to introspect the python ABI for this machine.
Darwin)
local platforms=("${osx_platform_noabi}")
;;
Linux)
local platforms=("${linux_platform_noabi}")
;;
*)
echo >&2 "Unknown uname"
exit 1
;;
esac
local platforms=("${platform}")
local dest="${ROOT}/dist/pants.${PANTS_UNSTABLE_VERSION}.${platform}.pex"
local stable_dest="${DEPLOY_DIR}/pex/pants.${PANTS_STABLE_VERSION}.${platform}.pex"
;;
fetch)
local platforms=("${linux_platform}" "${osx_platform}")
# NB: We do not include Python 3 wheels, as we cannot release a Python 3 compatible PEX
# until https://github.com/pantsbuild/pex/issues/654 is fixed.
local platforms=()
for platform in "${linux_platform_noabi}" "${osx_platform_noabi}"; do
for abi in "cp-27-mu" "cp-27-m"; do
platforms=("${platforms[@]}" "${platform}-${abi}")
done
done
local dest="${ROOT}/dist/pants.${PANTS_UNSTABLE_VERSION}.pex"
local stable_dest="${DEPLOY_DIR}/pex/pants.${PANTS_STABLE_VERSION}.pex"
;;
Expand Down