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

[dist] swap mac/linux wheel build order #9746

Merged
merged 1 commit into from
Jul 28, 2020
Merged

[dist] swap mac/linux wheel build order #9746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,37 +99,37 @@ matrix:
script:
- true # we still need this block to exist, otherwise it will fall back to the global one

# Build Linux wheels and multi-platform jars.
- os: linux
# Build MacOS wheels and MacOS jars
- os: osx
osx_image: xcode7
env:
- LINUX_WHEELS=1 LINUX_JARS=1
- MAC_WHEELS=1 MAC_JARS=1
- PYTHONWARNINGS=ignore
- RAY_INSTALL_JAVA=1
install:
- . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
- . ./ci/travis/ci.sh init RAY_CI_MACOS_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
before_script:
- . ./ci/travis/ci.sh build
script:
- . ./ci/travis/ci.sh test_wheels
- bash ./java/build-jar-multiplatform.sh linux
cache: false
- bash ./java/build-jar-multiplatform.sh darwin

# Build MacOS wheels and MacOS jars
- os: osx
osx_image: xcode7
# Build Linux wheels and multi-platform jars.
- os: linux
env:
- MAC_WHEELS=1 MULTIPLATFORM_JARS=1
- LINUX_WHEELS=1 MULTIPLATFORM_JARS=1
- PYTHONWARNINGS=ignore
- RAY_INSTALL_JAVA=1
install:
- . ./ci/travis/ci.sh init RAY_CI_MACOS_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
- . ./ci/travis/ci.sh init RAY_CI_LINUX_WHEELS_AFFECTED,RAY_CI_JAVA_AFFECTED,RAY_CI_STREAMING_JAVA_AFFECTED
before_script:
- . ./ci/travis/ci.sh build
script:
- . ./ci/travis/ci.sh test_wheels
- bash ./java/build-jar-multiplatform.sh darwin
- bash ./java/build-jar-multiplatform.sh linux
- bash ./java/build-jar-multiplatform.sh multiplatform
#- bash ./java/build-jar-multiplatform.sh deploy
cache: false

# RLlib: Learning tests (from rllib/tuned_examples/*.yaml).
- os: linux
Expand Down Expand Up @@ -411,7 +411,7 @@ deploy:
on:
repo: ray-project/ray
all_branches: true
condition: $MULTIPLATFORM_JARS = 1 || $LINUX_JARS=1
condition: $MULTIPLATFORM_JARS = 1 || $MAC_JARS=1

- provider: s3
edge: true # This supposedly opts in to deploy v2.
Expand All @@ -427,7 +427,7 @@ deploy:
on:
repo: ray-project/ray
branch: master
condition: $MULTIPLATFORM_JARS = 1 || $LINUX_JARS=1
condition: $MULTIPLATFORM_JARS = 1 || $MAC_JARS=1

- provider: script
edge: true # This supposedly opts in to deploy v2.
Expand Down
6 changes: 3 additions & 3 deletions java/build-jar-multiplatform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ build_jars_multiplatform() {
build_jars multiplatform false
}

# Download linux/windows ray-related jar from s3
# This function assumes darwin jars exist already.
# Download darwin/windows ray-related jar from s3
# This function assumes linux jars exist already.
download_jars() {
local wait_time=0
local sleep_time_units=60

for f in "$@"; do
for os in 'linux' 'windows'; do
for os in 'darwin' 'windows'; do
if [[ "$os" == "windows" ]]; then
break
fi
Expand Down