diff options
| author |  pcloudy <pcloudy@google.com> | 2017-07-21 14:43:22 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-24 09:51:04 +0200 |
| commit | 321301c5ae59dfc8fceb7c9b9efbb416669f4a0e (patch) | |
| tree | 462d2ab4c4155120e91c544397cc805af2a07709 /scripts/ci | |
| parent | 71a20e3e139f3b812338f20392eb46dd61d6c10f (diff) | |
Don't build MSYS Bazel anymore
This is the first CL to remove MSYS Bazel.
RELNOTES:
PiperOrigin-RevId: 162731750
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/windows/compile_windows.sh | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh index 08ab6b5341..8bb5cdfb45 100755 --- a/scripts/ci/windows/compile_windows.sh +++ b/scripts/ci/windows/compile_windows.sh @@ -37,14 +37,6 @@ if [ -n "${release_label}" ]; then export EMBED_LABEL="${release_label}" fi -# On windows-msvc-x86_64, we build a MSVC Bazel -OPTS="--cpu=x64_windows_msys --host_cpu=x64_windows_msys" -MSVC_LABEL="" -if [[ $PLATFORM_NAME == windows-msvc-x86_64* ]]; then - OPTS="" - MSVC_LABEL="-msvc" -fi - export MSYS_NO_PATHCONV=1 export MSYS2_ARG_CONV_EXCL="*" @@ -56,14 +48,13 @@ ${BOOTSTRAP_BAZEL} --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc version ${BOOTSTRAP_BAZEL} --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc build \ --embed_label=${release_label} --stamp \ - ${OPTS} \ //src:bazel //src:bazel_with_jdk # Copy the resulting artifacts. mkdir -p output/ci -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/ci/bazel-$(get_full_release_name)-without-jdk.exe +cp bazel-bin/src/bazel_with_jdk output/ci/bazel-$(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 +zip -j output/ci/bazel-$(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 +zip -j output/ci/bazel-$(get_full_release_name).zip output/bazel.exe |