Skip to content

Commit

Permalink
Revert "Use minimal Bazel for downstream projects. (bazelbuild#428)" (b…
Browse files Browse the repository at this point in the history
…azelbuild#429)

This reverts commit d24015f.

We decided it's better to actually change what //src:bazel refers to and
add a //src:bazel-dev instead.
  • Loading branch information
meisterT authored and joeleba committed Jun 17, 2019
1 parent 4076d49 commit 69a7c2a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions buildkite/bazelci.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,17 +723,17 @@ def print_environment_variables_info():

def upload_bazel_binary(platform):
print_collapsed_group(":gcloud: Uploading Bazel Under Test")
binary_path = "bazel-bin/src/bazel_jdk_minimal"
binary_path = "bazel-bin/src/bazel"
if platform == "windows":
binary_path = r"bazel-bin\src\bazel_jdk_minimal"
binary_path = r"bazel-bin\src\bazel"
execute_command(["buildkite-agent", "artifact", "upload", binary_path])


def download_bazel_binary(dest_dir, platform):
host_platform = PLATFORMS[platform].get("host-platform", platform)
binary_path = "bazel-bin/src/bazel_jdk_minimal"
binary_path = "bazel-bin/src/bazel"
if platform == "windows":
binary_path = r"bazel-bin\src\bazel_jdk_minimal"
binary_path = r"bazel-bin\src\bazel"

source_step = create_label(host_platform, "Bazel", build_only=True)
execute_command(["buildkite-agent", "artifact", "download",
Expand Down

0 comments on commit 69a7c2a

Please sign in to comment.