mirror of
https://github.com/vale981/ray
synced 2025-03-05 10:01:43 -05:00
Fix windows buildkite (#26615)
- Stop using dot command to run ci.sh script: it doesn't fail the build if the command fails for windows and is generally dangerous since it will make unexpected changes to the current shell. - Fix uncovered windows build issues.
This commit is contained in:
parent
1991029a19
commit
1b2b526a2b
4 changed files with 18 additions and 17 deletions
|
@ -12,8 +12,8 @@ prelude_commands: &prelude_commands |-
|
|||
rm -rf /tmp/bazel_event_logs
|
||||
cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
|
||||
(which bazel && bazel clean) || true;
|
||||
. ./ci/ci.sh init && source ~/.zshrc
|
||||
. ./ci/ci.sh build
|
||||
./ci/ci.sh init && source ~/.zshrc
|
||||
./ci/ci.sh build
|
||||
./ci/env/install-dependencies.sh
|
||||
|
||||
epilogue_commands: &epilogue_commands |-
|
||||
|
@ -43,10 +43,10 @@ steps:
|
|||
- export MAC_WHEELS=1
|
||||
- export MAC_JARS=1
|
||||
- export RAY_INSTALL_JAVA=1
|
||||
- . ./ci/ci.sh init && source ~/.zshrc
|
||||
- . ./ci/ci.sh build
|
||||
- ./ci/ci.sh init && source ~/.zshrc
|
||||
- ./ci/ci.sh build
|
||||
# Test wheels
|
||||
- . ./ci/ci.sh test_wheels
|
||||
- ./ci/ci.sh test_wheels
|
||||
# Build jars
|
||||
- bash ./java/build-jar-multiplatform.sh darwin
|
||||
# Upload the wheels and jars
|
||||
|
@ -105,7 +105,7 @@ steps:
|
|||
conditions: ["RAY_CI_CORE_CPP_AFFECTED", "RAY_CI_PYTHON_AFFECTED"]
|
||||
commands:
|
||||
- *prelude_commands
|
||||
- . ./ci/ci.sh test_large
|
||||
- ./ci/ci.sh test_large
|
||||
- *epilogue_commands
|
||||
|
||||
- label: ":mac: :apple: Medium A-J"
|
||||
|
|
|
@ -31,16 +31,16 @@ steps:
|
|||
- *prelude_commands
|
||||
# conda init should be moved to the docker image setup
|
||||
- conda init
|
||||
- . ./ci/ci.sh init
|
||||
- . ./ci/ci.sh build
|
||||
- if [ "${BUILDKITE_PARALLEL_JOB}" = "0" ]; then . ./ci/ci.sh test_core; fi
|
||||
- ./ci/ci.sh init
|
||||
- ./ci/ci.sh build
|
||||
- if [ "${BUILDKITE_PARALLEL_JOB}" = "0" ]; then ./ci/ci.sh test_core; fi
|
||||
# The next command will be sharded into $parallelism shards.
|
||||
- . ./ci/ci.sh test_python
|
||||
- ./ci/ci.sh test_python
|
||||
|
||||
- label: ":windows: Wheels"
|
||||
commands:
|
||||
- *prelude_commands
|
||||
- export WINDOWS_WHEELS="1"
|
||||
- . ./ci/ci.sh init
|
||||
- . ./ci/ci.sh build
|
||||
- ./ci/ci.sh init
|
||||
- ./ci/ci.sh build
|
||||
- *upload_wheels_if_needed
|
||||
|
|
|
@ -317,7 +317,7 @@
|
|||
parallelism: 3
|
||||
commands:
|
||||
- cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
|
||||
- . ./ci/ci.sh test_large
|
||||
- ./ci/ci.sh test_large
|
||||
- label: ":python: (Medium A-J)"
|
||||
conditions: ["RAY_CI_PYTHON_AFFECTED"]
|
||||
commands:
|
||||
|
@ -345,7 +345,7 @@
|
|||
parallelism: 3
|
||||
commands:
|
||||
- cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
|
||||
- TEST_EXTERNAL_REDIS=1 . ./ci/ci.sh test_large
|
||||
- TEST_EXTERNAL_REDIS=1 ./ci/ci.sh test_large
|
||||
- label: ":redis: (External Redis) (Medium A-J)"
|
||||
conditions: ["RAY_CI_PYTHON_AFFECTED"]
|
||||
commands:
|
||||
|
|
7
ci/ci.sh
7
ci/ci.sh
|
@ -122,8 +122,6 @@ test_core() {
|
|||
args+=(
|
||||
-//:core_worker_test
|
||||
-//:event_test
|
||||
-//:gcs_pub_sub_test
|
||||
-//:gcs_server_test
|
||||
-//:gcs_server_rpc_test
|
||||
-//:ray_syncer_test # TODO (iycheng): it's flaky on windows. Add it back once we figure out the cause
|
||||
-//:gcs_client_reconnection_test
|
||||
|
@ -706,7 +704,10 @@ configure_system() {
|
|||
# Usage: init [JOB_NAMES]
|
||||
# - JOB_NAMES (optional): Comma-separated list of job names to trigger on.
|
||||
init() {
|
||||
_check_job_triggers "${1-}"
|
||||
# TODO(jjyao): fix it for windows
|
||||
if [ "${OSTYPE}" != msys ]; then
|
||||
_check_job_triggers "${1-}"
|
||||
fi
|
||||
|
||||
configure_system
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue