diff options
| author |  philwo <philwo@google.com> | 2017-04-28 17:51:22 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-28 18:33:30 +0200 |
| commit | 6f7066e3112315d259c00d5b68330a326391ec31 (patch) | |
| tree | b0f860baefa4d74dccc5cd4db0c58c78e18536ef /scripts/ci/build.sh | |
| parent | 2541fd93287ff135c3348a3986cea7dfc8444f71 (diff) | |
Bundled JDK changes for the release process. This is a fixed version
that should not break CI this time...
- Make the default Bazel release artifacts include the bundled JDK.
- Create additional Bazel release artifacts without a bundled JDK.
Tested by running "bazel build //scripts/..." in a clean checkout and
one with this patch in, then diffing the entire bazel-out folder and
manually inspecting the resulting files (zips, tar.gz, deb, rpm) to make
sure that they contain the right files. Looks all good now, so let's try
again.
PiperOrigin-RevId: 154544164
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 |