Fix most of build_test pipeline

google · Jan 7, 2025 · f5064a6 · f5064a6
1 parent 7ef8b92
commit f5064a6
Show file tree

Hide file tree

Showing 8 changed files with 268 additions and 25 deletions.
diff --git a/.github/workflows/build_test.yml b/.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

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
@@ -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 $< $@",

diff --git a/java/org/brotli/dec/BUILD.bazel b/java/org/brotli/dec/BUILD.bazel
@@ -10,7 +10,7 @@ licenses(["notice"])  # MIT
 TEST_DEPS = [
     ":dec",
     ":test_utils",
-    "@maven//:junit_junit",
+    "@brotli_maven//:junit_junit",
 ]
 
 java_library(

diff --git a/java/org/brotli/pom.xml b/java/org/brotli/pom.xml
@@ -80,8 +80,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>

diff --git a/java/org/brotli/wrapper/common/BUILD.bazel b/java/org/brotli/wrapper/common/BUILD.bazel
@@ -30,7 +30,7 @@ java_library(
         "//org/brotli/dec",
         "//org/brotli/integration:brotli_jni_test_base",
         "//org/brotli/wrapper/dec",
-        "@maven//:junit_junit",
+        "@brotli_maven//:junit_junit",
     ],
 )
 

diff --git a/java/org/brotli/wrapper/dec/BUILD.bazel b/java/org/brotli/wrapper/dec/BUILD.bazel
@@ -30,7 +30,7 @@ java_library(
         "//org/brotli/integration:brotli_jni_test_base",
         "//org/brotli/integration:bundle_helper",
         "//org/brotli/wrapper/enc",
-        "@maven//:junit_junit",
+        "@brotli_maven//:junit_junit",
     ],
 )
 

diff --git a/java/org/brotli/wrapper/enc/BUILD.bazel b/java/org/brotli/wrapper/enc/BUILD.bazel
@@ -37,7 +37,7 @@ java_library(
         "//org/brotli/integration:bundle_helper",
         "//org/brotli/wrapper/common",
         "//org/brotli/wrapper/dec",
-        "@maven//:junit_junit",
+        "@brotli_maven//:junit_junit",
     ],
 )