diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 8240cb4b..7d7d8621 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -47,11 +47,9 @@ jobs: steps: - uses: actions/checkout@v6 - name: Build Connections - run: CC=clang-16 CXX=clang-16++ bazel build --proto_compiler=@com_github_protobuf_prebuilt//:protoc --copt='-DGITHUB_BUILD' //connections:core - - name: Build Presence - run: CC=clang-16 CXX=clang-16++ bazel build --proto_compiler=@com_github_protobuf_prebuilt//:protoc --copt='-DGITHUB_BUILD' //presence - - name: Build Sharing - run: CC=clang-16 CXX=clang-16++ bazel build --proto_compiler=@com_github_protobuf_prebuilt//:protoc --verbose_failures --copt='-DGITHUB_BUILD' //sharing/proto/... + run: CC=clang-18 CXX=clang-18++ BAZEL_CXXOPTS="-std=c++20" bazel build --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true --copt='-DGITHUB_BUILD' //connections:core +# - name: Build Presence +# run: CC=clang-18 CXX=clang-18++ BAZEL_CXXOPTS="-std=c++20" bazel build --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true --copt='-DGITHUB_BUILD' //presence build-rust-linux: name: Build Rust on Linux diff --git a/MODULE.bazel b/MODULE.bazel index 61269bef..28339a88 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,14 +1,14 @@ bazel_dep(name = "platforms", version = "1.0.0") -bazel_dep(name = "rules_apple", version = "3.19.0") -bazel_dep(name = "rules_cc", version = "0.2.0") -bazel_dep(name = "rules_rust", version = "0.54.1") -bazel_dep(name = "bazel_skylib", version = "1.8.1") -bazel_dep(name = "abseil-cpp", version = "20250814.0", repo_name = "com_google_absl") +bazel_dep(name = "rules_apple", version = "4.3.3") +bazel_dep(name = "rules_cc", version = "0.2.16") +bazel_dep(name = "rules_rust", version = "0.68.1") +bazel_dep(name = "bazel_skylib", version = "1.9.0") +bazel_dep(name = "abseil-cpp", version = "20260107.0", repo_name = "com_google_absl") # version of prebuilt protoc in com_github_protobuf_prebuilt must match this. -bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf") -bazel_dep(name = "googletest", version = "1.17.0", repo_name = "com_google_googletest") -bazel_dep(name = "boringssl", version = "0.0.0-20240126-22d349c") +bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf") +bazel_dep(name = "googletest", version = "1.17.0.bcr.2", repo_name = "com_google_googletest") +bazel_dep(name = "boringssl", version = "0.20251124.0") git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") @@ -51,6 +51,7 @@ http_archive( http_archive( name = "aappleby_smhasher", build_file_content = """ +load("@rules_cc//cc:cc_library.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) cc_library( name = "libmurmur3", @@ -66,6 +67,7 @@ cc_library( http_archive( name = "nlohmann_json", build_file_content = """ +load("@rules_cc//cc:cc_library.bzl", "cc_library") cc_library( name = "json", hdrs = glob([ @@ -101,16 +103,3 @@ http_archive( strip_prefix = "protobuf-matchers-master", urls = ["https://github.com/inazarenko/protobuf-matchers/archive/refs/heads/master.zip"], ) - -http_archive( - name = "com_github_protobuf_prebuilt", - build_file_content = """ -filegroup( - name = "protoc", - srcs = ["bin/protoc"], - visibility = ["//visibility:public"], -)""", - urls = [ - "https://github.com/protocolbuffers/protobuf/releases/download/v32.0/protoc-32.0-linux-x86_64.zip", - ], -)