From 6fd2ce163746c94683eacdd799d72e7c49622ce5 Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Thu, 24 Oct 2019 14:03:54 -0400 Subject: [PATCH 1/3] Inhibit attempted copying of missing crypto.if.lib for static win32 build Signed-off-by: William A Rowe Jr Signed-off-by: Yechiel Kalmenson --- bazel/boringssl_static.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bazel/boringssl_static.patch b/bazel/boringssl_static.patch index 4360d06a3c9c..dd2a72847a38 100644 --- a/bazel/boringssl_static.patch +++ b/bazel/boringssl_static.patch @@ -10,3 +10,19 @@ index d7c731bf6..315cdeca0 100644 ], "//conditions:default": ["-DOPENSSL_NO_ASM"], }) +@@ -141,6 +142,7 @@ cc_library( + ":windows_x86_64": ["-defaultlib:advapi32.lib"], + "//conditions:default": ["-lpthread"], + }), ++ linkstatic = True, + visibility = ["//visibility:public"], + ) + +@@ -150,6 +152,7 @@ cc_library( + hdrs = ssl_headers, + copts = boringssl_copts_cxx, + includes = ["src/include"], ++ linkstatic = True, + visibility = ["//visibility:public"], + deps = [ + ":crypto", From 3eaa3087f824836831d8c96807efdae3fe394047 Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Thu, 31 Oct 2019 11:03:06 -0400 Subject: [PATCH 2/3] Windows build tests for PR8280/PR8754 components This tests compilation of several components in the Windows CI which were impacted by the recent foreign_cc cmake build changes and proposed fixes to boringssl's internal bazel build schema. Signed-off-by: William A Rowe Jr Signed-off-by: Yechiel Kalmenson Signed-off-by: William A Rowe Jr --- ci/windows_ci_steps.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/windows_ci_steps.ps1 b/ci/windows_ci_steps.ps1 index 6c8f906cb9e7..247720f843fc 100644 --- a/ci/windows_ci_steps.ps1 +++ b/ci/windows_ci_steps.ps1 @@ -1 +1,6 @@ bazel --bazelrc=windows\.bazelrc test @envoy_api//test/build/... +bazel --bazelrc=windows\.bazelrc build @boringssl//:ssl +bazel --bazelrc=windows\.bazelrc build //external:ares +bazel --bazelrc=windows\.bazelrc build //external:event +bazel --bazelrc=windows\.bazelrc build //external:yaml_cpp +bazel --bazelrc=windows\.bazelrc build //external:zlib From ffffaacd2eee052b7988f29d57baf1221e623e68 Mon Sep 17 00:00:00 2001 From: William A Rowe Jr Date: Fri, 1 Nov 2019 09:59:15 -0400 Subject: [PATCH 3/3] Change test file syntax to unwind odd CI behavior Signed-off-by: William A Rowe Jr Signed-off-by: Yechiel Kalmenson Signed-off-by: William A Rowe Jr --- ci/windows_ci_steps.ps1 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ci/windows_ci_steps.ps1 b/ci/windows_ci_steps.ps1 index 247720f843fc..ffbd7051a78d 100644 --- a/ci/windows_ci_steps.ps1 +++ b/ci/windows_ci_steps.ps1 @@ -1,6 +1,11 @@ -bazel --bazelrc=windows\.bazelrc test @envoy_api//test/build/... -bazel --bazelrc=windows\.bazelrc build @boringssl//:ssl -bazel --bazelrc=windows\.bazelrc build //external:ares -bazel --bazelrc=windows\.bazelrc build //external:event -bazel --bazelrc=windows\.bazelrc build //external:yaml_cpp -bazel --bazelrc=windows\.bazelrc build //external:zlib +#!powershell.exe -Command + +bazel.exe --bazelrc=windows/.bazelrc test "@envoy_api//test/build/..." + +bazel.exe --bazelrc=windows/.bazelrc build "@boringssl//:ssl" + +bazel.exe --bazelrc=windows/.bazelrc build "//external:ares" + +bazel.exe --bazelrc=windows/.bazelrc build "//external:event" + +bazel.exe --bazelrc=windows/.bazelrc build "//external:yaml_cpp"