Skip to content

Commit

Permalink
Fix build_test pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
eustas committed Jan 6, 2025
1 parent d019271 commit 30b0f1f
Show file tree
Hide file tree
Showing 20 changed files with 1,215 additions and 178 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -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",
)
240 changes: 240 additions & 0 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion WORKSPACE.bazel

This file was deleted.

20 changes: 20 additions & 0 deletions c/fuzz/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -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 = "../..",
)
323 changes: 323 additions & 0 deletions c/fuzz/MODULE.bazel.lock

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions c/fuzz/WORKSPACE.bazel

This file was deleted.

21 changes: 21 additions & 0 deletions go/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -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 = "..",
)
258 changes: 258 additions & 0 deletions go/MODULE.bazel.lock

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions go/WORKSPACE.bazel

This file was deleted.

10 changes: 6 additions & 4 deletions java/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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 $< $@",
Expand Down
34 changes: 34 additions & 0 deletions java/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# 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_java",
version = "1.1.0",
repo_name = "org_brotli_java",
)

bazel_dep(name = "rules_java", version = "8.6.3")
bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "rules_kotlin", version = "2.1.0")
bazel_dep(name = "platforms", version = "0.0.10")

bazel_dep(name = "brotli", version = "1.1.0", repo_name = "org_brotli")
local_path_override(
module_name = "brotli",
path = "..",
)

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
name = "brotli_maven",
artifacts = ["junit:junit:4.13.2"],
repositories = [
"https://maven.google.com",
"https://repo1.maven.org/maven2"
],
)
use_repo(maven, "brotli_maven")
Loading

0 comments on commit 30b0f1f

Please sign in to comment.