Skip to content

Commit 2fd7088

Browse files
jketemaCopilot
andcommitted
Preserve CodeQL patches in updated Bazel modules
Keep the fmt Windows Unicode workaround and the rules_shell pin when updating the patched modules. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 7905840 commit 2fd7088

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/overlay/BUILD.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ cc_library(
4848
hdrs = glob([
4949
"include/fmt/*.h",
5050
]),
51-
copts = select({
52-
"@rules_cc//cc/compiler:msvc-cl": ["/utf-8"],
51+
# CodeQL change: disable UTF8 support, it's causing issues on Windows
52+
defines = select({
53+
"@rules_cc//cc/compiler:msvc-cl": ["FMT_UNICODE=0"],
5354
"//conditions:default": [],
5455
}),
5556
includes = ["include"],

‎misc/bazel/registry/modules/fmt/12.2.0-codeql.1/source.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"integrity": "sha256-ovSo1RF4+VTkwzkAf3ft12ugyy42+HpI5aVAPZvlh48=",
44
"strip_prefix": "fmt-12.2.0",
55
"overlay": {
6-
"BUILD.bazel": "sha256-BKWH8pPJ8RaLgAt5l9eceTsN7cAdZz5nut+MR7jScbU=",
6+
"BUILD.bazel": "sha256-Zn5kky5jBkuqoek9UpzuHX4sTkqyhUKnjENJwJxRCEI=",
77
"MODULE.bazel": "sha256-VcjblZqKNctLUTX1rWpwOehV8rd4X23XeJzs+S5tfCk="
88
}
99
}

‎misc/bazel/registry/modules/rules_dotnet/0.22.2-codeql.1/MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use_repo(apphost_packs_extension, "dotnet.apphost_packs")
4747
bazel_dep(name = "bazel_skylib", version = "1.7.1")
4848
bazel_dep(name = "platforms", version = "1.0.0")
4949
bazel_dep(name = "bazel_lib", version = "3.0.0")
50-
bazel_dep(name = "rules_shell", version = "0.5.0")
50+
bazel_dep(name = "rules_shell", version = "0.6.1")
5151

5252
# Dev dependencies
5353
bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)

0 commit comments

Comments
 (0)