From 2e8a6ce775dfcf4b6f251f098c42a28bb5c314da Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 11:55:13 -0700 Subject: [PATCH 01/10] [CI] Enable bzlmod Somehow I missed this in my PR adding support for bzlmod --- .bazelrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index fc170b0e8b..f169347647 100644 --- a/.bazelrc +++ b/.bazelrc @@ -4,9 +4,6 @@ # bazel configurations for running tests under sanitizers. # Based on https://github.com/bazelment/trunk/blob/master/tools/bazel.rc -# TODO: Remove once support is added, avoid MODULE.bazel creation for now -common --enable_bzlmod=false - # Enable automatic configs based on platform common --enable_platform_specific_config From 8ccf6764800bcf38ed14c1e4bce71360390b6f4e Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 12:18:04 -0700 Subject: [PATCH 02/10] ldap lib --- examples/http/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/http/BUILD b/examples/http/BUILD index 6e98ac03f5..1716bccc3c 100644 --- a/examples/http/BUILD +++ b/examples/http/BUILD @@ -15,6 +15,7 @@ cc_binary( "-DEFAULTLIB:advapi32.lib", "-DEFAULTLIB:crypt32.lib", "-DEFAULTLIB:Normaliz.lib", + "-DEFAULTLIB:wldap32.lib", ], "//conditions:default": [], }), From 3310facc305bfdde9451dce9df64be7bf7e1d2a7 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 15:24:27 -0700 Subject: [PATCH 03/10] another windows lib --- ext/test/http/BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/test/http/BUILD b/ext/test/http/BUILD index d030ec2847..19b1161572 100644 --- a/ext/test/http/BUILD +++ b/ext/test/http/BUILD @@ -6,6 +6,12 @@ cc_test( srcs = [ "curl_http_test.cc", ], + linkopts = select({ + "//bazel:windows": [ + "-DEFAULTLIB:wldap32.lib", + ], + "//conditions:default": [], + }), tags = ["test"], deps = [ "//ext:headers", From 79cc7e82a88e7e373f2d55cb20f01c9ce94ea006 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 15:27:31 -0700 Subject: [PATCH 04/10] newer grpc --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7b84c2b719..4356942187 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -11,7 +11,7 @@ module( bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "curl", version = "8.4.0") -bazel_dep(name = "grpc", version = "1.62.1", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "grpc", version = "1.63.0", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json") bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto") bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing") From 06bfd4bd274080d602d5737759549ff1134e7478 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 15:28:36 -0700 Subject: [PATCH 05/10] wrong version --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 4356942187..884ed4778d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -11,7 +11,7 @@ module( bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "curl", version = "8.4.0") -bazel_dep(name = "grpc", version = "1.63.0", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "grpc", version = "1.63.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json") bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto") bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing") From 4c7a43c5479cb7190b7219447be134568a25f5d6 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 15:47:50 -0700 Subject: [PATCH 06/10] update curl to disable ldap --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 884ed4778d..7fa2b57958 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -10,7 +10,7 @@ module( bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl") bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "curl", version = "8.4.0") +bazel_dep(name = "curl", version = "8.8.0") bazel_dep(name = "grpc", version = "1.63.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json") bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto") From a94b114d7253dd0fa22c36fe32d768fa1b38f68f Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 16:58:21 -0700 Subject: [PATCH 07/10] bump grpc --- MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7fa2b57958..4a03753e15 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -11,7 +11,7 @@ module( bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "curl", version = "8.8.0") -bazel_dep(name = "grpc", version = "1.63.1", repo_name = "com_github_grpc_grpc") +bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json") bazel_dep(name = "opentelemetry-proto", version = "1.3.1", repo_name = "com_github_opentelemetry_proto") bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing") From d7e279a1df5129ee97136bd933970a89b624e15d Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 17:54:02 -0700 Subject: [PATCH 08/10] Discard changes to ext/test/http/BUILD --- ext/test/http/BUILD | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ext/test/http/BUILD b/ext/test/http/BUILD index 19b1161572..d030ec2847 100644 --- a/ext/test/http/BUILD +++ b/ext/test/http/BUILD @@ -6,12 +6,6 @@ cc_test( srcs = [ "curl_http_test.cc", ], - linkopts = select({ - "//bazel:windows": [ - "-DEFAULTLIB:wldap32.lib", - ], - "//conditions:default": [], - }), tags = ["test"], deps = [ "//ext:headers", From d201f9f5a6eccbf16ad20f3d905611e83bcea1c8 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 Jul 2024 17:54:04 -0700 Subject: [PATCH 09/10] Discard changes to examples/http/BUILD --- examples/http/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/http/BUILD b/examples/http/BUILD index 1716bccc3c..6e98ac03f5 100644 --- a/examples/http/BUILD +++ b/examples/http/BUILD @@ -15,7 +15,6 @@ cc_binary( "-DEFAULTLIB:advapi32.lib", "-DEFAULTLIB:crypt32.lib", "-DEFAULTLIB:Normaliz.lib", - "-DEFAULTLIB:wldap32.lib", ], "//conditions:default": [], }), From d4671646edcae63270826a6d246b30b01de72a18 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 12 Jul 2024 11:35:09 -0700 Subject: [PATCH 10/10] shorter paths --- ci/do_ci.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/do_ci.ps1 b/ci/do_ci.ps1 index 62e174854e..bcae6359bb 100644 --- a/ci/do_ci.ps1 +++ b/ci/do_ci.ps1 @@ -11,8 +11,8 @@ $nproc = (Get-ComputerInfo).CsNumberOfLogicalProcessors $SRC_DIR = (Get-Item -Path ".\").FullName # Workaround https://github.com/bazelbuild/bazel/issues/18683 -$BAZEL_STARTUP_OPTIONS = "--output_base=C:\Out" -$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT" +$BAZEL_STARTUP_OPTIONS = "--output_base=C:\O" +$BAZEL_OPTIONS = "--copt=-DENABLE_ASYNC_EXPORT --compilation_mode=dbg" $BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors" if (!(test-path build)) {