From 975a18a6d7402f174d66a0f77d554caa38bd93d7 Mon Sep 17 00:00:00 2001 From: dmarting Date: Tue, 9 May 2017 05:47:47 -0400 Subject: [PATCH] Do not mark the JDK7 installer -without-jdk-installer Instead just mark it as a default installer when there is no installer with a bundled JDK. Fixes #2969 To be cherry-picked for #2692. PiperOrigin-RevId: 155483548 --- scripts/ci/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index db846f7085849d..0b1cd4e3603531 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -145,8 +145,10 @@ function bazel_build() { # The version with a bundled JDK may not exist on all platforms. if [ "${JAVA_VERSION}" = "1.8" -a -e "bazel-bin/scripts/packages/with-jdk/install.sh" ]; then cp bazel-bin/scripts/packages/with-jdk/install.sh $1/bazel-${release_label}-installer.sh + cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-without-jdk-installer.sh + else + cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-installer.sh fi - cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-without-jdk-installer.sh if [ "$PLATFORM" = "linux" ]; then cp bazel-bin/scripts/packages/debian/bazel-debian.deb $1/bazel_${release_label}.deb cp -f bazel-genfiles/scripts/packages/debian/bazel.dsc $1/bazel.dsc