Merge branch 'master' into add-python-abi3

Author: K0lb3

.github/workflows/build_test.yml

@@ -47,24 +47,25 @@ jobs:
             build_system: cmake
             c_compiler: clang-15
             cxx_compiler: clang++15
+            os: ubuntu-22.04
 
-          - name: cmake:clang15:asan
+          - name: cmake:clang:asan
             build_system: cmake
             sanitizer: address
-            c_compiler: clang-15
-            cxx_compiler: clang++15
+            c_compiler: clang
+            cxx_compiler: clang++
 
-          - name: cmake:clang15:tsan
+          - name: cmake:clang:tsan
             build_system: cmake
             sanitizer: thread
-            c_compiler: clang-15
-            cxx_compiler: clang++15
+            c_compiler: clang
+            cxx_compiler: clang++
 
-          - name: cmake:clang15:ubsan
+          - name: cmake:clang:ubsan
             build_system: cmake
             sanitizer: undefined
-            c_compiler: clang-15
-            cxx_compiler: clang++-15
+            c_compiler: clang
+            cxx_compiler: clang++
             c_flags: -fno-sanitize-recover=undefined,integer
 
           - name: cmake:qemu-arm-neon-gcc
@@ -98,10 +99,10 @@ jobs:
             cmake_config: Debug
             os: windows-latest
 
-          - name: fuzz:clang15
+          - name: fuzz:clang
             build_system: fuzz
-            c_compiler: clang-15
-            cxx_compiler: clang++15
+            c_compiler: clang
+            cxx_compiler: clang++
 
           # TODO: consider running this combination in docker
           #- name: python2.7:gcc5
@@ -131,11 +132,11 @@ jobs:
           # TODO: consider running this combination in docker
           #- name: python3.8:gcc5
 
-          - name: python3.10:clang15
+          - name: python3.10:clang
             build_system: python
             python_version: "3.10"
-            c_compiler: clang-15
-            cxx_compiler: clang++-15
+            c_compiler: clang
+            cxx_compiler: clang++
 
           - name: python3.10-win
             build_system: python

MODULE.bazel

@@ -0,0 +1,12 @@
+# Copyright 2025 The Brotli Authors. All rights reserved.
+#
+# Distributed under MIT license.
+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+
+"""Brotli reference implementation"""
+
+module(
+    name = "brotli",
+    version = "1.1.0",
+    repo_name = "org_brotli",
+)

WORKSPACE.bazel

@@ -0,0 +1,20 @@
+# Copyright 2025 The Brotli Authors. All rights reserved.
+#
+# Distributed under MIT license.
+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+
+"""Brotli reference implementation"""
+
+module(
+    name = "brotli_fuzz",
+    version = "1.1.0",
+    repo_name = "org_brotli_fuzz",
+)
+
+bazel_dep(name = "rules_fuzzing", version = "0.5.2")
+
+bazel_dep(name = "brotli", version = "1.1.0", repo_name = "org_brotli")
+local_path_override(
+    module_name = "brotli",
+    path = "../..",
+)

c/fuzz/MODULE.bazel

@@ -0,0 +1,21 @@
+# Copyright 2025 The Brotli Authors. All rights reserved.
+#
+# Distributed under MIT license.
+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+
+"""Brotli reference implementation"""
+
+module(
+    name = "brotli_go",
+    version = "1.1.0",
+    repo_name = "org_brotli_go",
+)
+
+bazel_dep(name = "rules_go", version = "0.51.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.40.0")
+
+bazel_dep(name = "brotli", version = "1.1.0", repo_name = "org_brotli")
+local_path_override(
+    module_name = "brotli",
+    path = "..",
+)

c/fuzz/MODULE.bazel.lock

@@ -6,17 +6,19 @@ package(
 
 genrule(
     name = "copy_link_jni_header",
-    srcs = ["@openjdk_jni_h//file"],
+    srcs = ["@bazel_tools//tools/jdk:jni_header"],
     outs = ["jni/jni.h"],
     cmd = "cp -f $< $@",
 )
 
 genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
-        "@platforms//os:macos":  ["@openjdk_macosx_jni_md_h//file"],
-        "@platforms//os:windows": ["@openjdk_windows_jni_md_h//file"],
-        "//conditions:default": ["@openjdk_solaris_jni_md_h//file"],
+        "@bazel_tools//src/conditions:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+        "@bazel_tools//src/conditions:freebsd": ["@bazel_tools//tools/jdk:jni_md_header-freebsd"],
+        "@bazel_tools//src/conditions:openbsd": ["@bazel_tools//tools/jdk:jni_md_header-openbsd"],
+        "@bazel_tools//src/conditions:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
+        "//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
     }),
     outs = ["jni/jni_md.h"],
     cmd = "cp -f $< $@",