diff options
| author |  Philipp Wollermann <philwo@google.com> | 2017-04-20 18:35:16 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-24 16:49:08 +0200 |
| commit | 2c4dd1f3176371473667c551cd5a5ae5992f8154 (patch) | |
| tree | ae14af405f97661dd04c632bc1fd4b7c092e4f33 /scripts/ci/build.sh | |
| parent | 8b6d96656f1e690c41d250110d91f310ae159756 (diff) | |
Bundled JDK changes for the release process.
- Make the default Bazel release artifacts include the bundled JDK.
- Create additional Bazel release artifacts without a bundled JDK.
Change-Id: If87c986507ae8e7dbbf0e8f163dd0073a206b265
PiperOrigin-RevId: 153718827
Diffstat (limited to 'scripts/ci/build.sh')
| -rwxr-xr-x | scripts/ci/build.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 08c7389470..6599e72b80 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -142,7 +142,11 @@ function bazel_build() { # Copy the results to the output directory mkdir -p $1/packages cp bazel-bin/src/bazel $1/bazel - cp bazel-bin/scripts/packages/install.sh $1/bazel-${release_label}-installer.sh + # 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 + 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 |