Skip to content

Commit

Permalink
Revert "[ci] collapse sphinix lint into build_sphinx_docs (#36538)"
Browse files Browse the repository at this point in the history
This reverts commit 3ced85c.
  • Loading branch information
rickyyx authored Jun 20, 2023
1 parent 3cc712f commit fd1d4ea
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
# See https://stackoverflow.com/questions/63383400/error-cannot-uninstall-ruamel-yaml-while-creating-docker-image-for-azure-ml-a
# Pin urllib to avoid downstream ssl incompatibility issues. This matches requirements-doc.txt.
- pip install "mosaicml==0.12.1" "urllib3<1.27" --ignore-installed
- ./ci/ci.sh build_sphinx_docs
- ./ci/ci.sh build

- label: ":octopus: Tune multinode tests"
conditions: ["NO_WHEELS_REQUIRED", "RAY_CI_TUNE_AFFECTED"]
Expand Down
27 changes: 15 additions & 12 deletions ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,6 @@ build_dashboard_front_end() {
}

build_sphinx_docs() {
_bazel_build_protobuf
install_ray

(
cd "${WORKSPACE_DIR}"/doc
if [ "${OSTYPE}" = msys ]; then
Expand Down Expand Up @@ -416,8 +413,6 @@ validate_wheels_commit_str() {
}

build_wheels_and_jars() {
_bazel_build_before_install

# Create wheel output directory and empty contents
# If buildkite runners are re-used, wheels from previous builds might be here, so we delete them.
mkdir -p .whl
Expand Down Expand Up @@ -734,15 +729,23 @@ init() {
}

build() {
if [[ "${NEED_WHEELS}" == "1" ]]; then
build_wheels_and_jars
return
if [ "${LINT-}" != 1 ]; then
_bazel_build_before_install
else
_bazel_build_protobuf
fi

if [[ "${NEED_WHEELS}" != "true" ]]; then
install_ray
if [ "${LINT-}" = 1 ]; then
# Try generating Sphinx documentation. To do this, we need to install Ray first.
build_sphinx_docs
fi
fi

# Build and install ray into the system.
# For building the wheel, see build_wheels_and_jars.
_bazel_build_before_install
install_ray
if [[ "${NEED_WHEELS}" == "true" ]]; then
build_wheels_and_jars
fi
}

run_minimal_test() {
Expand Down

0 comments on commit fd1d4ea

Please sign in to comment.