Skip to content

Commit 6f04166

Browse files
damienmgkchodorow
authored andcommitted
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 bazelbuild#2969 To be cherry-picked for bazelbuild#2692. PiperOrigin-RevId: 155483548
1 parent cbbb423 commit 6f04166

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

scripts/ci/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ function bazel_build() {
145145
# The version with a bundled JDK may not exist on all platforms.
146146
if [ "${JAVA_VERSION}" = "1.8" -a -e "bazel-bin/scripts/packages/with-jdk/install.sh" ]; then
147147
cp bazel-bin/scripts/packages/with-jdk/install.sh $1/bazel-${release_label}-installer.sh
148+
cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-without-jdk-installer.sh
149+
else
150+
cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-installer.sh
148151
fi
149-
cp bazel-bin/scripts/packages/without-jdk/install.sh $1/bazel-${release_label}-without-jdk-installer.sh
150152
if [ "$PLATFORM" = "linux" ]; then
151153
cp bazel-bin/scripts/packages/debian/bazel-debian.deb $1/bazel_${release_label}.deb
152154
cp -f bazel-genfiles/scripts/packages/debian/bazel.dsc $1/bazel.dsc

0 commit comments

Comments
 (0)