diff options
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/build.sh | 6 | ||||
| -rwxr-xr-x | scripts/ci/windows/compile_windows.sh | 10 |
2 files changed, 11 insertions, 5 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 diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh index 802edaeeaa..4168f551b5 100755 --- a/scripts/ci/windows/compile_windows.sh +++ b/scripts/ci/windows/compile_windows.sh @@ -48,11 +48,13 @@ fi ${BOOTSTRAP_BAZEL} --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc build \ --embed_label=${release_label} --stamp \ ${MSVC_OPTS} \ - //src:bazel + //src:bazel //src:bazel_with_jdk - -# Copy the resulting artifact. +# Copy the resulting artifacts. mkdir -p output/ci -cp bazel-bin/src/bazel output/ci/bazel${MSVC_LABEL}-$(get_full_release_name).exe +cp bazel-bin/src/bazel output/ci/bazel${MSVC_LABEL}-$(get_full_release_name)-without-jdk.exe +cp bazel-bin/src/bazel_with_jdk output/ci/bazel${MSVC_LABEL}-$(get_full_release_name).exe cp bazel-bin/src/bazel output/bazel.exe +zip -j output/ci/bazel${MSVC_LABEL}-$(get_full_release_name)-without-jdk.zip output/bazel.exe +cp -f bazel-bin/src/bazel_with_jdk output/bazel.exe zip -j output/ci/bazel${MSVC_LABEL}-$(get_full_release_name).zip output/bazel.exe |