Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Do not mark the JDK7 installer -without-jdk-installer
Browse files Browse the repository at this point in the history
Instead just mark it as a default installer when there is
no installer with a bundled JDK.

Fixes bazelbuild#2969
To be cherry-picked for bazelbuild#2692.

PiperOrigin-RevId: 155483548
  • Loading branch information
damienmg authored and kchodorow committed May 9, 2017
1 parent cbbb423 commit 6f04166
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion scripts/ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6f04166

Please sign in to comment.