Skip to content

Commit

Permalink
Cleanup obselete logic for Kokoro builds now that all builds modulo M…
Browse files Browse the repository at this point in the history
…acOS are on GitHub Actions

`generate_index_html.sh` is unneeded for the MacOS build due to the build script calling it anyway: https://github.com/openxla/xla/blob/main/.kokoro/macos/build.sh#L23, and otherwise this change is an NFC

PiperOrigin-RevId: 726692254
  • Loading branch information
ddunl authored and Google-ML-Automation committed Feb 14, 2025
1 parent 51ba9b7 commit adc5799
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
21 changes: 1 addition & 20 deletions build_tools/ci/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,33 +151,14 @@ def commands(self) -> List[List[str]]:
"""Returns list of commands for a build."""
cmds = []

if "self_hosted" not in self.type_.name.lower():
cmds.append([
f"{_KOKORO_ARTIFACTS_DIR}/github/xla/.kokoro/generate_index_html.sh",
"index.html",
])
if self.repo != "openxla/xla":
_, repo_name = self.repo.split("/")

if "self_hosted" not in self.type_.name.lower():
cmds.append([
"git",
"clone",
"--depth=1",
f"https://github.com/{self.repo}",
f"./github/{repo_name}",
])

cmds.extend(self.extra_setup_commands)

# We really want `bazel fetch` here, but it uses `bazel query` and not
# `cquery`, which means that it fails due to config issues that aren't
# problems in practice.
# TODO(ddunleavy): Remove the condition here. Need to get parallel on the
# MacOS VM.
if self.type_ not in (
BuildType.MACOS_CPU_X86,
):
if self.type_ != BuildType.MACOS_CPU_X86:
cmds.append(
retry(
self.bazel_command(
Expand Down
1 change: 0 additions & 1 deletion build_tools/ci/golden_commands.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ bazel test --build_tag_filters=-multiaccelerator --test_tag_filters=-multiaccele
bazel analyze-profile profile.json.gz
# END BuildType.JAX_X86_GPU_T4_SELF_HOSTED
# BEGIN BuildType.MACOS_CPU_X86
$KOKORO_ARTIFACTS_DIR/github/xla/.kokoro/generate_index_html.sh index.html
sudo wget --no-verbose -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-darwin-amd64
chmod +x /usr/local/bin/bazel
bazel --version
Expand Down

0 comments on commit adc5799

Please sign in to comment.