Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
xFile3160 committed Apr 9, 2024
2 parents 210984b + 7c3f51b commit 83d1a2c
Show file tree
Hide file tree
Showing 97 changed files with 1,721 additions and 17 deletions.
39 changes: 39 additions & 0 deletions modules/abseil-cpp/20240116.2/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Copyright 2024 The Abseil Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# https://bazel.build/external/overview#bzlmod

module(
name = "abseil-cpp",
version = "20240116.2",
compatibility_level = 1,
)

# Only direct dependencies need to be listed below.
# Please keep the versions in sync with the versions in the WORKSPACE file.

bazel_dep(name = "bazel_skylib",
version = "1.5.0")

bazel_dep(name = "google_benchmark",
version = "1.8.3",
repo_name = "com_github_google_benchmark",
dev_dependency = True)

bazel_dep(name = "googletest",
version = "1.14.0.bcr.1",
repo_name = "com_google_googletest")

bazel_dep(name = "platforms",
version = "0.0.8")
20 changes: 20 additions & 0 deletions modules/abseil-cpp/20240116.2/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
matrix:
bazel:
- 6.x
- 7.x
platform:
- centos7_java11_devtoolset10
- debian10
- ubuntu2004
- macos
- windows
tasks:
verify_targets:
name: Verify build targets
platform: ${{ platform }}
bazel: ${{ bazel }}
build_flags:
- '--cxxopt=-std=c++14'
build_targets:
- '@abseil-cpp//absl/strings'
- '@abseil-cpp//absl/flags:flag'
5 changes: 5 additions & 0 deletions modules/abseil-cpp/20240116.2/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://github.com/abseil/abseil-cpp/releases/download/20240116.2/abseil-cpp-20240116.2.tar.gz",
"integrity": "sha256-czcmuMOm05pBINfkXqi0GkNM2s3kAculAPFCNsSbOdw=",
"strip_prefix": "abseil-cpp-20240116.2"
}
3 changes: 2 additions & 1 deletion modules/abseil-cpp/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"20230802.0.bcr.1",
"20230802.1",
"20240116.0",
"20240116.1"
"20240116.1",
"20240116.2"
],
"yanked_versions": {}
}
32 changes: 32 additions & 0 deletions modules/aspect_rules_lint/0.16.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"Bazel dependencies"

module(
name = "aspect_rules_lint",
version = "0.16.0",
compatibility_level = 1,
)

bazel_dep(name = "aspect_bazel_lib", version = "2.5.0")

# Needed in the root because we use js_lib_helpers in our aspect impl
# Minimum version needs 'chore: bump bazel-lib to 2.0 by @alexeagle in #1311'
# to allow users on bazel-lib 2.0
bazel_dep(name = "aspect_rules_js", version = "1.40.0")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "platforms", version = "0.0.7")
bazel_dep(name = "rules_multirun", version = "0.9.0")
bazel_dep(name = "rules_multitool", version = "0.4.0")

# Needed in the root because we dereference ProtoInfo in our aspect impl
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")

# Needed in the root because we dereference the toolchain in our aspect impl
bazel_dep(name = "rules_buf", version = "0.1.1")
bazel_dep(name = "toolchains_protoc", version = "0.2.1")

# Needed to get the 'go_context' symbol, to invoke golangci-lint
bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go")

multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
multitool.hub(lockfile = "//format:multitool.lock.json")
use_repo(multitool, "multitool")
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
===================================================================
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,9 +1,9 @@
"Bazel dependencies"

module(
name = "aspect_rules_lint",
- version = "0.0.0",
+ version = "0.16.0",
compatibility_level = 1,
)

bazel_dep(name = "aspect_bazel_lib", version = "2.5.0")
14 changes: 14 additions & 0 deletions modules/aspect_rules_lint/0.16.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
bcr_test_module:
module_path: "example"
matrix:
bazel: ["7.x", "6.x"]
platform: ["macos", "ubuntu2004"]
tasks:
run_tests:
name: "Run test module"
bazel: ${{ bazel }}
platform: ${{ platform }}
environment:
BAZELISK_BASE_URL: "https://github.com/bazelbuild/bazel/releases/download/"
test_targets:
- "//..."
9 changes: 9 additions & 0 deletions modules/aspect_rules_lint/0.16.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-FAropRdY1c3sQ9l8z5S0BppXE0fwkZ5gbevNV+Yqx0U=",
"strip_prefix": "rules_lint-0.16.0",
"url": "https://github.com/aspect-build/rules_lint/releases/download/v0.16.0/rules_lint-v0.16.0.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-FRsUzHutmPguwYS2I2mm5NU8NAjDi0JpQ+BvHspyhV0="
},
"patch_strip": 1
}
3 changes: 2 additions & 1 deletion modules/aspect_rules_lint/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"0.14.0",
"0.14.1",
"0.14.2",
"0.15.0"
"0.15.0",
"0.16.0"
],
"yanked_versions": {}
}
73 changes: 73 additions & 0 deletions modules/flatbuffers/24.3.7/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
module(
name = "flatbuffers",
version = "24.3.7",
compatibility_level = 1,
repo_name = "com_github_google_flatbuffers",
)

bazel_dep(
name = "aspect_bazel_lib",
version = "1.40.0",
)
bazel_dep(
name = "aspect_rules_esbuild",
version = "0.15.0",
)
bazel_dep(
name = "aspect_rules_js",
version = "1.34.1",
)
bazel_dep(
name = "aspect_rules_ts",
version = "1.4.5",
)
bazel_dep(
name = "grpc",
version = "1.48.1",
repo_name = "com_github_grpc_grpc",
)
bazel_dep(
name = "platforms",
version = "0.0.7",
)
bazel_dep(
name = "rules_cc",
version = "0.0.9",
)
bazel_dep(
name = "rules_go",
version = "0.41.0",
repo_name = "io_bazel_rules_go",
)
bazel_dep(
name = "rules_nodejs",
version = "5.8.3",
)
bazel_dep(
name = "rules_swift",
version = "1.2.0",
repo_name = "build_bazel_rules_swift",
)
# -- bazel_dep definitions -- #

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
npm.npm_translate_lock(
name = "npm",
npmrc = "//:.npmrc",
pnpm_lock = "//:pnpm-lock.yaml",
verify_node_modules_ignored = "//:.bazelignore",
)
use_repo(npm, "npm")

node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
use_repo(node, "nodejs_linux_amd64")

rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True)
rules_ts_ext.deps()
use_repo(rules_ts_ext, "npm_typescript")

non_module_dependencies = use_extension("//:extensions.bzl", "non_module_dependencies", dev_dependency = True)
use_repo(
non_module_dependencies,
"bazel_linux_x86_64",
)
22 changes: 22 additions & 0 deletions modules/flatbuffers/24.3.7/patches/extensions_dot_bzl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/extensions.bzl b/extensions.bzl
new file mode 100644
index 00000000..6805b9d8
--- /dev/null
+++ b/extensions.bzl
@@ -0,0 +1,16 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+
+def _non_module_dependencies_impl(_ctx):
+ http_file(
+ name = "bazel_linux_x86_64",
+ downloaded_file_path = "bazel",
+ executable = True,
+ sha256 = "e78fc3394deae5408d6f49a15c7b1e615901969ecf6e50d55ef899996b0b8458",
+ urls = [
+ "https://github.com/bazelbuild/bazel/releases/download/6.3.2/bazel-6.3.2-linux-x86_64",
+ ],
+ )
+
+non_module_dependencies = module_extension(
+ implementation = _non_module_dependencies_impl,
+)
76 changes: 76 additions & 0 deletions modules/flatbuffers/24.3.7/patches/module_dot_bazel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
--- a/MODULE.bazel
+++ a/MODULE.bazel
@@ -0,0 +1,73 @@
+module(
+ name = "flatbuffers",
+ version = "24.3.7",
+ compatibility_level = 1,
+ repo_name = "com_github_google_flatbuffers",
+)
+
+bazel_dep(
+ name = "aspect_bazel_lib",
+ version = "1.40.0",
+)
+bazel_dep(
+ name = "aspect_rules_esbuild",
+ version = "0.15.0",
+)
+bazel_dep(
+ name = "aspect_rules_js",
+ version = "1.34.1",
+)
+bazel_dep(
+ name = "aspect_rules_ts",
+ version = "1.4.5",
+)
+bazel_dep(
+ name = "grpc",
+ version = "1.48.1",
+ repo_name = "com_github_grpc_grpc",
+)
+bazel_dep(
+ name = "platforms",
+ version = "0.0.7",
+)
+bazel_dep(
+ name = "rules_cc",
+ version = "0.0.9",
+)
+bazel_dep(
+ name = "rules_go",
+ version = "0.41.0",
+ repo_name = "io_bazel_rules_go",
+)
+bazel_dep(
+ name = "rules_nodejs",
+ version = "5.8.3",
+)
+bazel_dep(
+ name = "rules_swift",
+ version = "1.2.0",
+ repo_name = "build_bazel_rules_swift",
+)
+# -- bazel_dep definitions -- #
+
+npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
+npm.npm_translate_lock(
+ name = "npm",
+ npmrc = "//:.npmrc",
+ pnpm_lock = "//:pnpm-lock.yaml",
+ verify_node_modules_ignored = "//:.bazelignore",
+)
+use_repo(npm, "npm")
+
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
+use_repo(node, "nodejs_linux_amd64")
+
+rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True)
+rules_ts_ext.deps()
+use_repo(rules_ts_ext, "npm_typescript")
+
+non_module_dependencies = use_extension("//:extensions.bzl", "non_module_dependencies", dev_dependency = True)
+use_repo(
+ non_module_dependencies,
+ "bazel_linux_x86_64",
+)
39 changes: 39 additions & 0 deletions modules/flatbuffers/24.3.7/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
matrix:
bazel:
- 6.x
- 7.x
tasks:
ubuntu1804_test:
bazel: ${{ bazel }}
platform: ubuntu1804
environment:
CC: clang
SWIFT_VERSION: "5.5.3"
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
PATH: "$PATH:$SWIFT_HOME/usr/bin"
shell_commands:
- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
- "mkdir $SWIFT_HOME"
- "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu1804/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu18.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
build_targets:
- "@flatbuffers//:*"
ubuntu2004_test:
bazel: ${{ bazel }}
platform: ubuntu2004
environment:
CC: clang
SWIFT_VERSION: "5.5.3"
SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
PATH: "$PATH:$SWIFT_HOME/usr/bin"
shell_commands:
- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
- "mkdir $SWIFT_HOME"
- "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
build_targets:
- "@flatbuffers//:*"
macos_test:
bazel: ${{ bazel }}
platform: macos
build_targets:
- "@flatbuffers//:*"
10 changes: 10 additions & 0 deletions modules/flatbuffers/24.3.7/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"url": "https://github.com/google/flatbuffers/archive/refs/tags/v24.3.7.tar.gz",
"integrity": "sha256-v/+dIVD8/4j4ROjGCLArKg6UySrqObBMBiR4NGQwR4Q=",
"strip_prefix": "flatbuffers-24.3.7",
"patches": {
"extensions_dot_bzl.patch": "sha256-JwLc+G7gQu2A+xJVjxwCDX8BwJdyspLLeVpnoklWYdM=",
"module_dot_bazel.patch": "sha256-VSnh2bAiXZYOqQ+QLXePEL85j0S9Lmm6kWxuq+uYOSI="
},
"patch_strip": 1
}
Loading

0 comments on commit 83d1a2c

Please sign in to comment.