diff --git a/.github/actions/generate/action.yml b/.github/actions/generate/action.yml index 2f6c9269..698de53f 100644 --- a/.github/actions/generate/action.yml +++ b/.github/actions/generate/action.yml @@ -17,6 +17,10 @@ inputs: description: Whether to build integration tests required: true default: "true" + build_benchmark: + description: Whether to build benchmark tests + required: true + default: "true" code_coverage: description: Whether conan's coverage option should be on or not required: true @@ -48,6 +52,7 @@ runs: CODE_COVERAGE: "${{ inputs.code_coverage == 'true' && 'True' || 'False' }}" STATIC_OPTION: "${{ inputs.static == 'true' && 'True' || 'False' }}" INTEGRATION_TESTS_OPTION: "${{ inputs.build_integration_tests == 'true' && 'True' || 'False' }}" + BENCHMARK_OPTION: "${{ inputs.build_benchmark == 'true' && 'True' || 'False' }}" TIME_TRACE: "${{ inputs.time_trace == 'true' && 'True' || 'False' }}" USE_MOLD: "${{ inputs.use_mold == 'true' && 'True' || 'False' }}" run: | @@ -60,6 +65,7 @@ runs: -o "&:static=${STATIC_OPTION}" \ -o "&:tests=True" \ -o "&:integration_tests=${INTEGRATION_TESTS_OPTION}" \ + -o "&:benchmark=${BENCHMARK_OPTION}" \ -o "&:lint=False" \ -o "&:coverage=${CODE_COVERAGE}" \ -o "&:time_trace=${TIME_TRACE}" \ diff --git a/conan.lock b/conan.lock index 92aa326d..1cd5a207 100644 --- a/conan.lock +++ b/conan.lock @@ -1,40 +1,40 @@ { "version": "0.5", "requires": [ - "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754325010.589", + "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754412218.488", "xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1754325010.01", "xrpl/2.5.0@clio/boost-odr#f68e48da1490c0a583052e4f068ada55%1754325014.392", "sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1754325009.708", - "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1754325008.333", - "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1754325007.743", + "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1754412158.144", + "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1754412148.014", "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656", - "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754325049.561", + "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754412120.055", "openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1754325006.553", "nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1754325004.398", "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374", - "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1754325004.399", + "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1754412069.24", "libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592", "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1754325002.385", - "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1754325001.617", + "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1754410401.723", "libarchive/3.7.6#7e902bb4ac1d20504fb330c0dd040192%1754325001.673", "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385", "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1754325000.842", - "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1754325057.315", + "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1754412166.358", "fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1754324999.086", "date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1754324996.727", "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1754324997.363", - "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1754324996.98", - "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1754324996.921", + "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1754412042.679", + "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1754412214.559", "boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368%1754325043.336", - "benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1752006671.408", - "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1754324997.245" + "benchmark/1.9.4#ce4403f7a24d3e1f907cd9da4b678be4%1749892625.885", + "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1754412054.336" ], "build_requires": [ - "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754325010.589", - "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754325049.561", + "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754412218.488", + "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754412120.055", "protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1754325048.831", - "cmake/3.31.8#dde3bde00bb843687e55aea5afa0e220%1754325008.551", - "b2/5.3.3#107c15377719889654eb9a162a673975%1754324996.935" + "cmake/3.31.8#dde3bde00bb843687e55aea5afa0e220%1754412060.968", + "b2/5.3.3#107c15377719889654eb9a162a673975%1754412065.321" ], "python_requires": [], "overrides": { diff --git a/conanfile.py b/conanfile.py index f42f2a9c..dd6a4e7a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -73,7 +73,7 @@ class ClioConan(ConanFile): if self.options.tests or self.options.integration_tests: self.requires('gtest/1.14.0') if self.options.benchmark: - self.requires('benchmark/1.8.3') + self.requires('benchmark/1.9.4') def configure(self): if self.settings.compiler == 'apple-clang': diff --git a/tools/rebuild_conan.py b/tools/rebuild_conan.py index 79dedf5c..825b012b 100755 --- a/tools/rebuild_conan.py +++ b/tools/rebuild_conan.py @@ -27,7 +27,7 @@ def rebuild(): f"--output-folder=build_{profile}_{build_type}", "-s", f"build_type={build_type}", "-o", "&:tests=True", - "-o", "&:integration_tests=True", + "-o", "&:benchmark=True", "--profile:all", profile ] & plumbum.FG