Revert "Refactor build options for Windows on CI"
This reverts commit 00bc7f99a137153e49f21967546c028374cd1e31.
Change-Id: Ie5b6be9040795da7247ccb987e9fda5377178bc8
diff --git a/jenkins/build_defs/github-jobs.bat.tpl b/jenkins/build_defs/github-jobs.bat.tpl
index e6df26d..9ae9fa6 100644
--- a/jenkins/build_defs/github-jobs.bat.tpl
+++ b/jenkins/build_defs/github-jobs.bat.tpl
@@ -67,12 +67,12 @@
:: Check variables.WINDOWS_BUILDS
if not "{{ variables.WINDOWS_BUILDS }}" == "" (
- call:bazel build --copt=-w --host_copt=-w {{ variables.WINDOWS_BUILDS }}
+ call:bazel build --copt=-w --cpu=x64_windows_msvc --host_copt=-w {{ variables.WINDOWS_BUILDS }}
)
:: Check variables.WINDOWS_TESTS
if not "{{ variables.WINDOWS_TESTS }}" == "" (
- call:bazel test --copt=-w --host_copt=-w {{ variables.WINDOWS_TESTS }}
+ call:bazel test --copt=-w --cpu=x64_windows_msvc --host_copt=-w {{ variables.WINDOWS_TESTS }}
)
set MSYS_OPTION=--cpu=x64_windows_msys --host_cpu=x64_windows_msys
diff --git a/jenkins/jobs/configs/bazel-tests.json b/jenkins/jobs/configs/bazel-tests.json
index 361273f..cce8206 100644
--- a/jenkins/jobs/configs/bazel-tests.json
+++ b/jenkins/jobs/configs/bazel-tests.json
@@ -99,7 +99,6 @@
"variation": ""
}],
"parameters": {
- "build_opts": ["--copt=-w", "--host_copt=-w"],
"test_opts": ["-k", "--build_tests_only"],
"tests": [
"//src/test/java/...",
@@ -122,7 +121,6 @@
"variation": ""
}],
"parameters": {
- "build_opts": ["--cpu=x64_windows_msys", "--host_cpu=x64_windows_msys"],
"test_opts": ["-k", "--build_tests_only"],
"tests": ["//src/tst/shell/bazel:bazel_windows_example_test"],
"targets": []
diff --git a/jenkins/jobs/configs/bootstrap.json b/jenkins/jobs/configs/bootstrap.json
index 6953a46..586e77a 100644
--- a/jenkins/jobs/configs/bootstrap.json
+++ b/jenkins/jobs/configs/bootstrap.json
@@ -81,8 +81,8 @@
"bazel-bin/src/bazel": ["bazel.exe", "bazel-msvc-%{release_name}.exe"]
},
"opts": [
- "--copt=-w",
- "--host_copt=-w"
+ "--cpu=x64_windows_msvc",
+ "--copt=/w"
]
}
},
