From 37a429ad12b4c9e6a62dbae4881a1ff03b81ab40 Mon Sep 17 00:00:00 2001 From: philwo Date: Wed, 18 Nov 2020 11:28:58 -0800 Subject: [PATCH] Fix dangling reference to bazel.fish. This was changed in https://github.com/bazelbuild/bazel/commit/20febacc0c02545684d3429fc21f28cf7ed8f461, but we forgot to update this reference. We only noticed this when trying to build the next release, because in the normal postsubmit the installer isn't built. This CL also adds the release artifacts to the CI config so this cannot happen again. PiperOrigin-RevId: 343119629 --- .bazelci/postsubmit.yml | 3 +++ .bazelci/presubmit.yml | 3 +++ scripts/packages/BUILD | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index cb172b1e28ff9a..81b8b29b8ff5d7 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -11,6 +11,9 @@ tasks: - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base" - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external" build_targets: + - "//:bazel-distfile.zip" + - "//scripts/packages/debian:bazel-debian.deb" + - "//scripts/packages:with-jdk/install.sh" - "//src:bazel" - "//src:bazel_jdk_minimal" - "//src:test_repos" diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 104cf52877498f..9d54a8623f0493 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -12,6 +12,9 @@ tasks: - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base" - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external" build_targets: + - "//:bazel-distfile.zip" + - "//scripts/packages/debian:bazel-debian.deb" + - "//scripts/packages:with-jdk/install.sh" - "//src:bazel" - "//src:bazel_jdk_minimal" - "//src:test_repos" diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index ea9cde8bfaceec..c915a93ce93884 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -125,7 +125,7 @@ genrule( ":%s/bazel-real" % kind, ":%s/bazel" % kind, "//scripts:bash_completion", - "//scripts/fish:completions/bazel.fish", + "//scripts:bazel.fish", "//scripts/zsh_completion:_bazel", ], launcher = ":launcher_bin.sh",