Roll dependencies. - Reorganize cmake deps (absl, re2 needs to be loaded before gtest). - Also remove unnecessary cmake defines from github workflow. PiperOrigin-RevId: 603711206
diff --git a/.github/workflows/cmake_test.yml b/.github/workflows/cmake_test.yml index fa18b27..a68db81 100644 --- a/.github/workflows/cmake_test.yml +++ b/.github/workflows/cmake_test.yml
@@ -59,7 +59,6 @@ -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \ -D CMAKE_BUILD_TYPE=RelWithDebug \ -D FUZZTEST_REPO_BRANCH="${{ github.head_ref || github.ref_name }}" \ - -D GTEST_HAS_ABSL=1 \ && cmake --build build_codelab -j $(nproc) - name: Run all tests in default mode if: matrix.mode == 'default' @@ -71,10 +70,7 @@ -D CMAKE_C_COMPILER_LAUNCHER=ccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \ -D CMAKE_BUILD_TYPE=RelWithDebug \ - -D RE2_BUILD_TESTING=off \ - -D protobuf_BUILD_TESTS=off \ -D FUZZTEST_BUILD_TESTING=on \ - -D GTEST_HAS_ABSL=1 \ && cmake --build build -j $(nproc) \ && ctest --test-dir build -j $(nproc) --output-on-failure - name: Run end-to-end tests in fuzzing mode @@ -87,11 +83,8 @@ -D CMAKE_C_COMPILER_LAUNCHER=ccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \ -D CMAKE_BUILD_TYPE=RelWithDebug \ - -D RE2_BUILD_TESTING=off \ - -D protobuf_BUILD_TESTS=off \ -D FUZZTEST_FUZZING_MODE=on \ -D FUZZTEST_BUILD_TESTING=on \ - -D GTEST_HAS_ABSL=1 \ && cmake --build build -j $(nproc) \ && ctest --test-dir build -j $(nproc) --output-on-failure -R "functional_test" - name: Save new cache based on main
diff --git a/WORKSPACE b/WORKSPACE index caa501b..22a8637 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -22,9 +22,9 @@ http_archive( name = "com_google_absl", - sha256 = "0ddd37f347c58d89f449dd189a645bfd97bcd85c5284404a3af27a3ca3476f39", - strip_prefix = "abseil-cpp-fad946221cec37175e762c399760f54b9de9a9fa", - url = "https://github.com/abseil/abseil-cpp/archive/fad946221cec37175e762c399760f54b9de9a9fa.tar.gz", + sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", + strip_prefix = "abseil-cpp-20240116.0", + url = "https://github.com/abseil/abseil-cpp/releases/download/20240116.0/abseil-cpp-20240116.0.tar.gz" ) ################################################################################ @@ -34,22 +34,20 @@ # Required by com_google_absl. http_archive( name = "bazel_skylib", - sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", - ], + sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"], ) ################################################################################ # Direct dependencies required for full FuzzTest (//fuzztest:fuzztest) ################################################################################ + http_archive( name = "com_googlesource_code_re2", - sha256 = "5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b", - strip_prefix = "re2-2023-09-01", - url = "https://github.com/google/re2/archive/refs/tags/2023-09-01.tar.gz", + sha256 = "cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb", + strip_prefix = "re2-2024-02-01", + url = "https://github.com/google/re2/releases/download/2024-02-01/re2-2024-02-01.tar.gz", ) http_archive( @@ -107,9 +105,9 @@ http_archive( name = "com_google_googletest", - sha256 = "2ebedb9330ff0e7e07abd77df9bd8c62692016a8138a4722f5259e7f657c89c1", - strip_prefix = "googletest-b3a9ba2b8e975550799838332803d468797ae2e1", - url = "https://github.com/google/googletest/archive/b3a9ba2b8e975550799838332803d468797ae2e1.tar.gz", + sha256 = "c12edde991f8346613d81ae34a78c4ddf36fc4275de12b0b0dd7eb5fa333c1a4", + strip_prefix = "googletest-456574145cf71a5375777cab58453acfd92a920b", + url = "https://github.com/google/googletest/archive/456574145cf71a5375777cab58453acfd92a920b.zip", ) http_archive(
diff --git a/cmake/BuildDependencies.cmake b/cmake/BuildDependencies.cmake index 95c57e5..0b30831 100644 --- a/cmake/BuildDependencies.cmake +++ b/cmake/BuildDependencies.cmake
@@ -2,22 +2,22 @@ include(FetchContent) -set(gtest_URL https://github.com/google/googletest.git) -set(gtest_TAG v1.14.0) - set(absl_URL https://github.com/abseil/abseil-cpp.git) -set(absl_TAG db08109eeb15fcd856761557f1668c2b34690036) +set(absl_TAG 20240116.0) set(re2_URL https://github.com/google/re2.git) -set(re2_TAG 2023-09-01) +set(re2_TAG 2024-02-01) -set(proto_URL https://github.com/protocolbuffers/protobuf.git) -set(proto_TAG 33b78e67a92c7ba1ecc2e19a037cd2e12f4c5e27) +set(gtest_URL https://github.com/google/googletest.git) +set(gtest_TAG 456574145cf71a5375777cab58453acfd92a920b) # From https://www.antlr.org/download.html set(antlr_cpp_URL https://www.antlr.org/download/antlr4-cpp-runtime-4.12.0-source.zip) set(antlr_cpp_MD5 acf7371bd7562188712751266d8a7b90) +set(proto_URL https://github.com/protocolbuffers/protobuf.git) +set(proto_TAG 33b78e67a92c7ba1ecc2e19a037cd2e12f4c5e27) + set(nlohmann_json_URL https://github.com/nlohmann/json.git) set(nlohmann_json_TAG v3.11.2) @@ -26,21 +26,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0135 NEW) endif() -if (FUZZTEST_BUILD_TESTING) - FetchContent_Declare( - nlohmann_json - GIT_REPOSITORY ${nlohmann_json_URL} - GIT_TAG ${nlohmann_json_TAG} - ) - FetchContent_MakeAvailable(nlohmann_json) -endif () - -FetchContent_Declare( - googletest - GIT_REPOSITORY ${gtest_URL} - GIT_TAG ${gtest_TAG} -) - FetchContent_Declare( abseil-cpp GIT_REPOSITORY ${absl_URL} @@ -48,35 +33,57 @@ ) FetchContent_Declare( - antlr_cpp - URL ${antlr_cpp_URL} - URL_HASH MD5=${antlr_cpp_MD5} -) - -FetchContent_Declare( re2 GIT_REPOSITORY ${re2_URL} GIT_TAG ${re2_TAG} ) +FetchContent_Declare( + googletest + GIT_REPOSITORY ${gtest_URL} + GIT_TAG ${gtest_TAG} +) + +FetchContent_Declare( + antlr_cpp + URL ${antlr_cpp_URL} + URL_HASH MD5=${antlr_cpp_MD5} +) + if (FUZZTEST_BUILD_TESTING) + FetchContent_Declare( protobuf GIT_REPOSITORY ${proto_URL} GIT_TAG ${proto_TAG} ) + + FetchContent_Declare( + nlohmann_json + GIT_REPOSITORY ${nlohmann_json_URL} + GIT_TAG ${nlohmann_json_TAG} + ) + endif () -FetchContent_MakeAvailable(googletest) -FetchContent_MakeAvailable(antlr_cpp) set(ABSL_PROPAGATE_CXX_STD ON) set(ABSL_ENABLE_INSTALL ON) FetchContent_MakeAvailable(abseil-cpp) -set(RE2_BUILD_TESTING OFF CACHE BOOL "") + +set(RE2_BUILD_TESTING OFF) FetchContent_MakeAvailable(re2) +set(GTEST_HAS_ABSL ON) +FetchContent_MakeAvailable(googletest) + +FetchContent_MakeAvailable(antlr_cpp) + if (FUZZTEST_BUILD_TESTING) + set(protobuf_BUILD_TESTS OFF) set(protobuf_INSTALL OFF) FetchContent_MakeAvailable(protobuf) + + FetchContent_MakeAvailable(nlohmann_json) + endif ()
diff --git a/codelab/WORKSPACE b/codelab/WORKSPACE index 97551ce..8b2df91 100644 --- a/codelab/WORKSPACE +++ b/codelab/WORKSPACE
@@ -25,27 +25,24 @@ # Required by com_google_absl. http_archive( name = "bazel_skylib", - sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", - ], + sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94", + urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"], ) # Required by com_google_fuzztest. http_archive( name = "com_google_absl", - sha256 = "da79745569dd8767ebd8f738fd3eec55ccd23e45b0e680a7b5b6bab7624de77b", - strip_prefix = "abseil-cpp-6acb60c161f1203e6eca929b87f2041da7714bfe", - url = "https://github.com/abseil/abseil-cpp/archive/6acb60c161f1203e6eca929b87f2041da7714bfe.tar.gz", + sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", + strip_prefix = "abseil-cpp-20240116.0", + url = "https://github.com/abseil/abseil-cpp/releases/download/20240116.0/abseil-cpp-20240116.0.tar.gz" ) # Required by com_google_fuzztest. http_archive( name = "com_googlesource_code_re2", - sha256 = "f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f", - strip_prefix = "re2-2022-06-01", - url = "https://github.com/google/re2/archive/refs/tags/2022-06-01.tar.gz", + sha256 = "cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb", + strip_prefix = "re2-2024-02-01", + url = "https://github.com/google/re2/releases/download/2024-02-01/re2-2024-02-01.tar.gz", ) ################################################################################ @@ -54,9 +51,9 @@ http_archive( name = "com_google_googletest", - sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2", - strip_prefix = "googletest-release-1.12.1", - url = "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz", + sha256 = "c12edde991f8346613d81ae34a78c4ddf36fc4275de12b0b0dd7eb5fa333c1a4", + strip_prefix = "googletest-456574145cf71a5375777cab58453acfd92a920b", + url = "https://github.com/google/googletest/archive/456574145cf71a5375777cab58453acfd92a920b.zip", ) # TODO(fniksic): Replace this with an http_archive after we release FuzzTest.