From c4dfab031eb8e448298c77245254fac578964b51 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 10:53:21 +0200 Subject: [PATCH 01/11] spdlog@1.14.0 --- modules/spdlog/1.14.0/MODULE.bazel | 9 +++++++++ modules/spdlog/1.14.0/overlay/BUILD.bazel | 15 +++++++++++++++ modules/spdlog/1.14.0/overlay/MODULE.bazel | 1 + modules/spdlog/1.14.0/presubmit.yml | 19 +++++++++++++++++++ modules/spdlog/1.14.0/source.json | 10 ++++++++++ modules/spdlog/metadata.json | 3 ++- 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 modules/spdlog/1.14.0/MODULE.bazel create mode 100644 modules/spdlog/1.14.0/overlay/BUILD.bazel create mode 120000 modules/spdlog/1.14.0/overlay/MODULE.bazel create mode 100644 modules/spdlog/1.14.0/presubmit.yml create mode 100644 modules/spdlog/1.14.0/source.json diff --git a/modules/spdlog/1.14.0/MODULE.bazel b/modules/spdlog/1.14.0/MODULE.bazel new file mode 100644 index 00000000000..6a30c120c3e --- /dev/null +++ b/modules/spdlog/1.14.0/MODULE.bazel @@ -0,0 +1,9 @@ +module( + name = "spdlog", + version = "1.14.0", + bazel_compatibility = [">=7.2.1"], + compatibility_level = 1, +) + +bazel_dep(name = "fmt", version = "10.2.1.bcr.1") +bazel_dep(name = "rules_cc", version = "0.0.9") diff --git a/modules/spdlog/1.14.0/overlay/BUILD.bazel b/modules/spdlog/1.14.0/overlay/BUILD.bazel new file mode 100644 index 00000000000..9a2c36fb440 --- /dev/null +++ b/modules/spdlog/1.14.0/overlay/BUILD.bazel @@ -0,0 +1,15 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + +cc_library( + name = "spdlog", + hdrs = glob([ + "include/**/*.h", + ]), + features = [ + "parse_headers", + ], + defines = ["SPDLOG_FMT_EXTERNAL"], + includes = ["include"], + visibility = ["//visibility:public"], + deps = ["@fmt"], +) diff --git a/modules/spdlog/1.14.0/overlay/MODULE.bazel b/modules/spdlog/1.14.0/overlay/MODULE.bazel new file mode 120000 index 00000000000..9b599e3ad9c --- /dev/null +++ b/modules/spdlog/1.14.0/overlay/MODULE.bazel @@ -0,0 +1 @@ +../MODULE.bazel \ No newline at end of file diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml new file mode 100644 index 00000000000..c64b38d6204 --- /dev/null +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -0,0 +1,19 @@ +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [7.x] +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: + - "--process_headers_in_dependencies" + build_targets: + - "@spdlog//:spdlog" diff --git a/modules/spdlog/1.14.0/source.json b/modules/spdlog/1.14.0/source.json new file mode 100644 index 00000000000..b26c9d9e660 --- /dev/null +++ b/modules/spdlog/1.14.0/source.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/gabime/spdlog/archive/refs/tags/v1.14.0.tar.gz", + "integrity": "sha256-U08u4aTcvrIiSYVu37K+dqHPT3CKILCsLtCQ7iTP28k=", + "strip_prefix": "spdlog-1.14.0", + "patch_strip": 0, + "overlay": { + "MODULE.bazel": "sha256-Z0j1BcMPTO2LdKrtyWHo1bL0MI5tE4a2jbwak3QcD2Y=", + "BUILD.bazel": "sha256-DwllxrKTGyUqOPGhCH+WFXeUQIOUxkRAeDBbX2iLrFg=" + } +} diff --git a/modules/spdlog/metadata.json b/modules/spdlog/metadata.json index d7866c16825..ffce9e67e43 100644 --- a/modules/spdlog/metadata.json +++ b/modules/spdlog/metadata.json @@ -14,7 +14,8 @@ "1.10.0", "1.11.0", "1.12.0", - "1.13.0" + "1.13.0", + "1.14.0" ], "yanked_versions": {} } From 33308caa4299ae16218b92f924bcb367faa52eee Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 10:58:26 +0200 Subject: [PATCH 02/11] Fix hashes --- modules/spdlog/1.14.0/source.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/spdlog/1.14.0/source.json b/modules/spdlog/1.14.0/source.json index b26c9d9e660..0040e5e01c7 100644 --- a/modules/spdlog/1.14.0/source.json +++ b/modules/spdlog/1.14.0/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/gabime/spdlog/archive/refs/tags/v1.14.0.tar.gz", - "integrity": "sha256-U08u4aTcvrIiSYVu37K+dqHPT3CKILCsLtCQ7iTP28k=", + "integrity": "sha256-Qpprc63oKFyyH4O6z4nigh3Rcg6n+qPLUY/+BLTgDvw=", "strip_prefix": "spdlog-1.14.0", "patch_strip": 0, "overlay": { - "MODULE.bazel": "sha256-Z0j1BcMPTO2LdKrtyWHo1bL0MI5tE4a2jbwak3QcD2Y=", - "BUILD.bazel": "sha256-DwllxrKTGyUqOPGhCH+WFXeUQIOUxkRAeDBbX2iLrFg=" + "BUILD.bazel": "sha256-o1bbLF70a7nUZxaWJ85FG7xdAZE1zWWzb0XDQvwFCvw=", + "MODULE.bazel": "sha256-6HKQSgBmaRZ7JTvSn5zHlOMI8gp8+67bLwZs6MCW1sY=" } } From fd2d3dd1db0e2998b55728a349103118fed41d4b Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 14:37:17 +0200 Subject: [PATCH 03/11] Add tests --- modules/spdlog/1.14.0/MODULE.bazel | 2 ++ modules/spdlog/1.14.0/overlay/BUILD.bazel | 41 +++++++++++++++++++++-- modules/spdlog/1.14.0/presubmit.yml | 10 ++++-- modules/spdlog/1.14.0/source.json | 4 +-- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/modules/spdlog/1.14.0/MODULE.bazel b/modules/spdlog/1.14.0/MODULE.bazel index 6a30c120c3e..f88a9f672ce 100644 --- a/modules/spdlog/1.14.0/MODULE.bazel +++ b/modules/spdlog/1.14.0/MODULE.bazel @@ -7,3 +7,5 @@ module( bazel_dep(name = "fmt", version = "10.2.1.bcr.1") bazel_dep(name = "rules_cc", version = "0.0.9") + +bazel_dep(name = "catch2", version = "3.6.0", dev_dependency = True) diff --git a/modules/spdlog/1.14.0/overlay/BUILD.bazel b/modules/spdlog/1.14.0/overlay/BUILD.bazel index 9a2c36fb440..840be8d0559 100644 --- a/modules/spdlog/1.14.0/overlay/BUILD.bazel +++ b/modules/spdlog/1.14.0/overlay/BUILD.bazel @@ -5,11 +5,46 @@ cc_library( hdrs = glob([ "include/**/*.h", ]), - features = [ - "parse_headers", - ], + #features = [ + # "parse_headers", + #], defines = ["SPDLOG_FMT_EXTERNAL"], includes = ["include"], visibility = ["//visibility:public"], deps = ["@fmt"], ) + +cc_test( + name = "spdlog_test", + srcs = [ + "tests/includes.h", + "tests/main.cpp", + "tests/test_async.cpp", + "tests/test_backtrace.cpp", + "tests/test_cfg.cpp", + "tests/test_circular_q.cpp", + "tests/test_create_dir.cpp", + "tests/test_custom_callbacks.cpp", + "tests/test_daily_logger.cpp", + "tests/test_dup_filter.cpp", + "tests/test_eventlog.cpp", + "tests/test_file_helper.cpp", + "tests/test_file_logging.cpp", + "tests/test_fmt_helper.cpp", + "tests/test_macros.cpp", + "tests/test_misc.cpp", + "tests/test_mpmc_q.cpp", + "tests/test_pattern_formatter.cpp", + "tests/test_registry.cpp", + "tests/test_sink.h", + "tests/test_stdout_api.cpp", + "tests/test_stopwatch.cpp", + "tests/test_time_point.cpp", + "tests/utils.cpp", + "tests/utils.h", + ], + deps = [ + ":spdlog", + "@catch2//:catch2_main", + ], +) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index c64b38d6204..e742f66be31 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -13,7 +13,13 @@ tasks: name: Verify build targets platform: ${{ platform }} bazel: ${{ bazel }} - build_flags: - - "--process_headers_in_dependencies" + #build_flags: + # - "--process_headers_in_dependencies" build_targets: - "@spdlog//:spdlog" + run_test_module: + name: Run test module + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - //... diff --git a/modules/spdlog/1.14.0/source.json b/modules/spdlog/1.14.0/source.json index 0040e5e01c7..d5ed970cb1c 100644 --- a/modules/spdlog/1.14.0/source.json +++ b/modules/spdlog/1.14.0/source.json @@ -4,7 +4,7 @@ "strip_prefix": "spdlog-1.14.0", "patch_strip": 0, "overlay": { - "BUILD.bazel": "sha256-o1bbLF70a7nUZxaWJ85FG7xdAZE1zWWzb0XDQvwFCvw=", - "MODULE.bazel": "sha256-6HKQSgBmaRZ7JTvSn5zHlOMI8gp8+67bLwZs6MCW1sY=" + "MODULE.bazel": "sha256-OTCzt1tUo1D64q+KdX2p+m7mggwNj2HCyu0W+Q4Mfz0=", + "BUILD.bazel": "sha256-0zapB5kPW/0WSN4mauDzxeMDn5N25FLsiX67npLyyRM=" } } From cd2eea0b8d8b400220aff739afa87c0dd76e884b Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 14:41:31 +0200 Subject: [PATCH 04/11] Fix test target --- modules/spdlog/1.14.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index e742f66be31..093e2990236 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -22,4 +22,4 @@ tasks: platform: ${{ platform }} bazel: ${{ bazel }} test_targets: - - //... + - "@spdlog//..." \ No newline at end of file From 0e580fb0ad0bb3e33dc4db4080af0468673f7947 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 14:47:35 +0200 Subject: [PATCH 05/11] Try module path --- modules/spdlog/1.14.0/presubmit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index 093e2990236..f81e078512c 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -18,8 +18,9 @@ tasks: build_targets: - "@spdlog//:spdlog" run_test_module: + module_path: "" name: Run test module platform: ${{ platform }} bazel: ${{ bazel }} test_targets: - - "@spdlog//..." \ No newline at end of file + - "//..." \ No newline at end of file From 1ae22b5facf9441d51f649cbbb648bcccb18f6cb Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 15:11:14 +0200 Subject: [PATCH 06/11] Exclude tests --- modules/spdlog/1.14.0/presubmit.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index f81e078512c..9ea08de8912 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -17,10 +17,10 @@ tasks: # - "--process_headers_in_dependencies" build_targets: - "@spdlog//:spdlog" - run_test_module: - module_path: "" - name: Run test module - platform: ${{ platform }} - bazel: ${{ bazel }} - test_targets: - - "//..." \ No newline at end of file + #run_test_module: + # module_path: "" + # name: Run test module + # platform: ${{ platform }} + # bazel: ${{ bazel }} + # test_targets: + # - "//..." From edb2944da542262e020cd2e91623e5aa7e145429 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 16:41:02 +0200 Subject: [PATCH 07/11] CI test 1 --- modules/spdlog/1.14.0/presubmit.yml | 53 +++++++++++++++-------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index 9ea08de8912..60e6e3dc5d1 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -1,26 +1,27 @@ -matrix: - platform: - - debian10 - - debian11 - - macos - - macos_arm64 - - ubuntu2004 - - ubuntu2204 - - windows - bazel: [7.x] -tasks: - verify_targets: - name: Verify build targets - platform: ${{ platform }} - bazel: ${{ bazel }} - #build_flags: - # - "--process_headers_in_dependencies" - build_targets: - - "@spdlog//:spdlog" - #run_test_module: - # module_path: "" - # name: Run test module - # platform: ${{ platform }} - # bazel: ${{ bazel }} - # test_targets: - # - "//..." +bcr_test_module: + module_path: "." + matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [7.x] + tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + #build_flags: + # - "--process_headers_in_dependencies" + build_targets: + - "@spdlog//:spdlog" + run_tests: + name: Run test module + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." From 3eb962cebaaa2c76fc7a97fff1fb298880fc0bd4 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 16:44:24 +0200 Subject: [PATCH 08/11] CI test 2 --- modules/spdlog/1.14.0/presubmit.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index 60e6e3dc5d1..b0de7a5e06a 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -11,14 +11,14 @@ bcr_test_module: - windows bazel: [7.x] tasks: - verify_targets: - name: Verify build targets - platform: ${{ platform }} - bazel: ${{ bazel }} - #build_flags: - # - "--process_headers_in_dependencies" - build_targets: - - "@spdlog//:spdlog" + #verify_targets: + # name: Verify build targets + # platform: ${{ platform }} + # bazel: ${{ bazel }} + # #build_flags: + # # - "--process_headers_in_dependencies" + # build_targets: + # - "@spdlog//:spdlog" run_tests: name: Run test module platform: ${{ platform }} From a4ced964c38dfe28d952544128a19215798c40a1 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 16:55:21 +0200 Subject: [PATCH 09/11] CI test 3 --- modules/spdlog/1.14.0/presubmit.yml | 52 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index b0de7a5e06a..10951c10322 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -1,27 +1,25 @@ -bcr_test_module: - module_path: "." - matrix: - platform: - - debian10 - - debian11 - - macos - - macos_arm64 - - ubuntu2004 - - ubuntu2204 - - windows - bazel: [7.x] - tasks: - #verify_targets: - # name: Verify build targets - # platform: ${{ platform }} - # bazel: ${{ bazel }} - # #build_flags: - # # - "--process_headers_in_dependencies" - # build_targets: - # - "@spdlog//:spdlog" - run_tests: - name: Run test module - platform: ${{ platform }} - bazel: ${{ bazel }} - test_targets: - - "//..." +matrix: + platform: + - debian10 + - debian11 + - macos + - macos_arm64 + - ubuntu2004 + - ubuntu2204 + - windows + bazel: [7.x] +tasks: + #verify_targets: + # name: Verify build targets + # platform: ${{ platform }} + # bazel: ${{ bazel }} + # #build_flags: + # # - "--process_headers_in_dependencies" + # build_targets: + # - "@spdlog//:spdlog" + run_tests: + name: Run test module + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." From 1c680183e38069ff324ee7ae2e622cf9aae9c1fd Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 16:58:38 +0200 Subject: [PATCH 10/11] CI test 4 --- modules/spdlog/1.14.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index 10951c10322..fa46c9a615f 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -21,5 +21,5 @@ tasks: name: Run test module platform: ${{ platform }} bazel: ${{ bazel }} - test_targets: + build_targets: - "//..." From 31f440f0fc1732e621ed4a53fbeccca9de1cd352 Mon Sep 17 00:00:00 2001 From: Vertexwahn Date: Sat, 29 Jun 2024 17:13:45 +0200 Subject: [PATCH 11/11] Fix presubmit --- modules/spdlog/1.14.0/MODULE.bazel | 1 - modules/spdlog/1.14.0/overlay/BUILD.bazel | 3 --- modules/spdlog/1.14.0/presubmit.yml | 14 +++----------- modules/spdlog/1.14.0/source.json | 4 ++-- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/modules/spdlog/1.14.0/MODULE.bazel b/modules/spdlog/1.14.0/MODULE.bazel index f88a9f672ce..8e67eac8a13 100644 --- a/modules/spdlog/1.14.0/MODULE.bazel +++ b/modules/spdlog/1.14.0/MODULE.bazel @@ -1,7 +1,6 @@ module( name = "spdlog", version = "1.14.0", - bazel_compatibility = [">=7.2.1"], compatibility_level = 1, ) diff --git a/modules/spdlog/1.14.0/overlay/BUILD.bazel b/modules/spdlog/1.14.0/overlay/BUILD.bazel index 840be8d0559..304d0d45338 100644 --- a/modules/spdlog/1.14.0/overlay/BUILD.bazel +++ b/modules/spdlog/1.14.0/overlay/BUILD.bazel @@ -5,9 +5,6 @@ cc_library( hdrs = glob([ "include/**/*.h", ]), - #features = [ - # "parse_headers", - #], defines = ["SPDLOG_FMT_EXTERNAL"], includes = ["include"], visibility = ["//visibility:public"], diff --git a/modules/spdlog/1.14.0/presubmit.yml b/modules/spdlog/1.14.0/presubmit.yml index fa46c9a615f..d4bd35be62e 100644 --- a/modules/spdlog/1.14.0/presubmit.yml +++ b/modules/spdlog/1.14.0/presubmit.yml @@ -9,17 +9,9 @@ matrix: - windows bazel: [7.x] tasks: - #verify_targets: - # name: Verify build targets - # platform: ${{ platform }} - # bazel: ${{ bazel }} - # #build_flags: - # # - "--process_headers_in_dependencies" - # build_targets: - # - "@spdlog//:spdlog" - run_tests: - name: Run test module + verify_targets: + name: Verify build targets platform: ${{ platform }} bazel: ${{ bazel }} build_targets: - - "//..." + - "@spdlog//:spdlog" diff --git a/modules/spdlog/1.14.0/source.json b/modules/spdlog/1.14.0/source.json index d5ed970cb1c..95ed7c88f41 100644 --- a/modules/spdlog/1.14.0/source.json +++ b/modules/spdlog/1.14.0/source.json @@ -4,7 +4,7 @@ "strip_prefix": "spdlog-1.14.0", "patch_strip": 0, "overlay": { - "MODULE.bazel": "sha256-OTCzt1tUo1D64q+KdX2p+m7mggwNj2HCyu0W+Q4Mfz0=", - "BUILD.bazel": "sha256-0zapB5kPW/0WSN4mauDzxeMDn5N25FLsiX67npLyyRM=" + "MODULE.bazel": "sha256-GHuABqPgX2KpwSjDbaF8nXEJSTWjngeQfWhtl9KBGkw=", + "BUILD.bazel": "sha256-gpZNyGbTQEop8NPMJYadNLbSALgJFiRryyk4H4U8mxM=" } }