diff options
| author |  dmarting <dmarting@google.com> | 2017-05-09 05:47:47 -0400 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2017-05-09 10:54:27 -0400 |
| commit | 6f041661ca159903691fcb443d86dc7b6454253d (patch) | |
| tree | 61f6a156ba94728eb821da971d591a17bd8b8006 | |
| parent | cbbb423663b154d82e3dfa5e9a56839583987999 (diff) | |
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
| -rwxr-xr-x | scripts/ci/build.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index db846f7085..0b1cd4e360 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 |