Skip to content

Commit

Permalink
Merge branch 'bazelbuild:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
BYVoid authored Jul 13, 2024
2 parents 467efcd + 1f7b457 commit 99f76f6
Show file tree
Hide file tree
Showing 205 changed files with 5,792 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dismiss_approvals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
egress-policy: audit

- name: Run BCR PR Reviewer
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@ecb81a9f161e6a560633222436406e41b93f6991 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify_maintainers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
egress-policy: audit

- name: Run BCR PR Reviewer
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@ecb81a9f161e6a560633222436406e41b93f6991 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/review_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Run BCR PR Reviewer
if: github.repository_owner == 'bazelbuild'
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@68dea4fe63a2ad44caaa8f3c44df19094b3dd395 # master
uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@ecb81a9f161e6a560633222436406e41b93f6991 # master
with:
# This token needs to be updated annually on Feb 05.
token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Then the presubmit will verify building `@zlib//:zlib` succeeds on all specified

While you can also specify `test_targets`, it may not always work since test targets can require additional dev dependencies that are not available when your project is not the root module.

**Note that** the task config syntax follows [Bazel CI's specifications](https://github.com/bazelbuild/continuous-integration/tree/master/buildkite#configuring-a-pipeline).
**Note that** the task config syntax follows [Bazel CI's specifications](https://github.com/bazelbuild/continuous-integration/tree/master/buildkite#configuring-a-pipeline). BCR requires the bazel version to be specified for each task via the `bazel` field.

### Test module

Expand Down Expand Up @@ -119,7 +119,7 @@ local_path_override(
)
```

**Note that** the task config syntax also follows [Bazel CI's specifications](https://github.com/bazelbuild/continuous-integration/tree/master/buildkite#configuring-a-pipeline), but just one level deeper under `bcr_test_module` and you have to specify the subdirectory of the test module via `module_path`.
**Note that** the task config syntax also follows [Bazel CI's specifications](https://github.com/bazelbuild/continuous-integration/tree/master/buildkite#configuring-a-pipeline), but just one level deeper under `bcr_test_module` and you have to specify the subdirectory of the test module via `module_path`. BCR requires the bazel version to be specified for each task via the `bazel` field.

## Yank a module version

Expand Down
23 changes: 23 additions & 0 deletions modules/apple_support/1.16.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module(
name = "apple_support",
version = "1.16.0",
bazel_compatibility = [">=6.0.0"],
compatibility_level = 1,
repo_name = "build_bazel_apple_support",
)

bazel_dep(name = "bazel_features", version = "1.10.0")
bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "platforms", version = "0.0.9")

bazel_dep(
name = "stardoc",
version = "0.6.2",
dev_dependency = True,
repo_name = "io_bazel_stardoc",
)

apple_cc_configure = use_extension("//crosstool:setup.bzl", "apple_cc_configure_extension")
use_repo(apple_cc_configure, "local_config_apple_cc", "local_config_apple_cc_toolchains")

register_toolchains("@local_config_apple_cc_toolchains//:all")
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
===================================================================
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,7 +1,7 @@
module(
name = "apple_support",
- version = "0",
+ version = "1.16.0",
bazel_compatibility = [">=6.0.0"],
compatibility_level = 1,
repo_name = "build_bazel_apple_support",
)
22 changes: 22 additions & 0 deletions modules/apple_support/1.16.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
matrix:
bazel: ["7.x", "rolling"]

tasks:
verify_targets:
name: "Build targets under //lib"
platform: ubuntu2004
bazel: ${{ bazel }}
build_targets:
- '@apple_support//lib/...'
run_tests:
name: "Run test targets"
platform: "macos_arm64"
bazel: ${{ bazel }}
build_targets:
- '@apple_support//lib/...'
test_targets:
- '@apple_support//test/...'
- '--'
# Needs visionOS SDK
- '-@apple_support//test:binary_visionos_arm64_simulator_test'
- '-@apple_support//test:binary_visionos_device_test'
9 changes: 9 additions & 0 deletions modules/apple_support/1.16.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-wxzo5TG1DvEzg5LuKd09s2iWaHAewyN7nGHiahk3qwc=",
"strip_prefix": "",
"url": "https://github.com/bazelbuild/apple_support/releases/download/1.16.0/apple_support.1.16.0.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-T2PMrL6Gg5lmiSIAFUDqU9SgDLcMo9WZ7+M3Uuw9Law="
},
"patch_strip": 1
}
3 changes: 2 additions & 1 deletion modules/apple_support/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"1.12.0",
"1.13.0",
"1.14.0",
"1.15.1"
"1.15.1",
"1.16.0"
],
"yanked_versions": {}
}
39 changes: 39 additions & 0 deletions modules/aspect_rules_lint/1.0.0-rc5/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"Bazel dependencies"

module(
name = "aspect_rules_lint",
version = "1.0.0-rc5",
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")

# 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")

multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
multitool.hub(lockfile = "//format:multitool.lock.json")
multitool.hub(lockfile = "//lint:multitool.lock.json")
use_repo(multitool, "multitool")

# Locally, use newer bazel-lib for stardoc
single_version_override(
module_name = "aspect_bazel_lib",
version = "2.7.7",
)

# 0.5.4 is the first version with bzlmod support
bazel_dep(name = "stardoc", version = "0.5.4", dev_dependency = True, repo_name = "io_bazel_stardoc")
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 = "1.0.0-rc5",
compatibility_level = 1,
)

bazel_dep(name = "aspect_bazel_lib", version = "2.5.0")
14 changes: 14 additions & 0 deletions modules/aspect_rules_lint/1.0.0-rc5/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: ["debian10", "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/1.0.0-rc5/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-RVV9MjYCSiEZWY+MpPsKsgNWa8mYAihbwMh2S7XuLjo=",
"strip_prefix": "rules_lint-1.0.0-rc5",
"url": "https://github.com/aspect-build/rules_lint/releases/download/v1.0.0-rc5/rules_lint-v1.0.0-rc5.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-q/gRx7aUbuxvXl42pl2qpxU8LOt0UMJkPnl3pw4fxWo="
},
"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 @@ -40,7 +40,8 @@
"1.0.0-rc1",
"1.0.0-rc2",
"1.0.0-rc3",
"1.0.0-rc4"
"1.0.0-rc4",
"1.0.0-rc5"
],
"yanked_versions": {}
}
27 changes: 27 additions & 0 deletions modules/bzlws/0.2.0/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module(
name = "bzlws",
version = "0.2.0",
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.6.1")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "yaml-cpp", version = "0.8.0")

bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True)
bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True)
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
git_override(
module_name = "hedron_compile_commands",
commit = "204aa593e002cbd177d30f11f54cff3559110bb9",
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
)

llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
llvm.toolchain(llvm_version = "17.0.6")
use_repo(llvm, "llvm_toolchain")

register_toolchains(
"@llvm_toolchain//:all",
dev_dependency = True,
)
18 changes: 18 additions & 0 deletions modules/bzlws/0.2.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
bcr_test_module:
module_path: test
matrix:
platform:
- ubuntu2204
- windows
- macos_arm64
# https://github.com/zaucy/bzlws/issues/19
# - macos
bazel: [7.x]
tasks:
run_test_module:
name: Build test module
platform: ${{ platform }}
bazel: ${{ bazel }}
build_targets: ['//...']
# https://github.com/zaucy/bzlws/issues/16
# test_targets: ['//...']
4 changes: 4 additions & 0 deletions modules/bzlws/0.2.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"integrity": "sha256-jl+BOXQ4QpE2DpndYZ6tN2TSMPvrL023GjfMtL9JjhQ=",
"url": "https://github.com/zaucy/bzlws/releases/download/0.2.0/bzlws-0.2.0.tar.gz"
}
17 changes: 17 additions & 0 deletions modules/bzlws/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"homepage": "https://github.com/zaucy/bzlws",
"maintainers": [
{
"email": "[email protected]",
"github": "zaucy",
"name": "Ezekiel Warren"
}
],
"repository": [
"github:zaucy/bzlws"
],
"versions": [
"0.2.0"
],
"yanked_versions": {}
}
5 changes: 5 additions & 0 deletions modules/cppregpattern/1.0.1/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module(
name = "cppregpattern",
version = "1.0.1",
)
bazel_dep(name = "rules_license", version = "0.0.8")
29 changes: 29 additions & 0 deletions modules/cppregpattern/1.0.1/patches/add_build_file.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git BUILD.bazel BUILD.bazel
new file mode 100644
index 00000000..d99b09e7
--- /dev/null
+++ BUILD.bazel
@@ -0,0 +1,22 @@
+load("@rules_license//rules:license.bzl", "license")
+
+package(
+ default_applicable_licenses = [":license"],
+ default_visibility = ["//visibility:public"],
+)
+
+exports_files(["LICENSE"])
+
+license(
+ name = "license",
+ package_name = "cppregpattern",
+ license_kinds = [
+ "@rules_license//licenses/spdx:MIT",
+ ],
+)
+
+cc_library(
+ name = "registry",
+ hdrs = ["include/cppregpattern/registry.h"],
+ strip_include_prefix = "include/",
+)
\ No newline at end of file
8 changes: 8 additions & 0 deletions modules/cppregpattern/1.0.1/patches/module_dot_bazel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- MODULE.bazel
+++ MODULE.bazel
@@ -0,0 +1,5 @@
+module(
+ name = "cppregpattern",
+ version = "1.0.1",
+)
+bazel_dep(name = "rules_license", version = "0.0.8")
17 changes: 17 additions & 0 deletions modules/cppregpattern/1.0.1/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
matrix:
platform:
- debian10
- ubuntu2004
- macos
- macos_arm64
- windows
bazel:
- 7.x
- 6.x
tasks:
verify_targets:
name: Verify build targets
platform: ${{ platform }}
bazel: ${{ bazel }}
build_targets:
- '@cppregpattern//:registry'
10 changes: 10 additions & 0 deletions modules/cppregpattern/1.0.1/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"url": "https://github.com/psalvaggio/cppregpattern/archive/17342e50c8248c750e8d35ca93d9f072e388ab58.tar.gz",
"integrity": "sha256-n/WIg6GYEkBrynLuBZg3C/V86ty3Vlf+YU/waFZr/6g=",
"strip_prefix": "cppregpattern-17342e50c8248c750e8d35ca93d9f072e388ab58",
"patch_strip": 0,
"patches": {
"module_dot_bazel.patch": "sha256-zmSrN0nyy0/42l47nd5U4xG0w6PHXxYTVDEPjSAMntM=",
"add_build_file.patch": "sha256-0TC1453qisEqtN4KhEnsUO3wSwT8E7vLp9afBfcxEXI="
}
}
17 changes: 17 additions & 0 deletions modules/cppregpattern/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"homepage": "https://github.com/psalvaggio/cppregpattern",
"maintainers": [
{
"email": "[email protected]",
"github": "udaya2899",
"name": "Udaya Prakash Nageswaran"
}
],
"repository": [
"github:psalvaggio/cppregpattern"
],
"versions": [
"1.0.1"
],
"yanked_versions": {}
}
10 changes: 10 additions & 0 deletions modules/curl/8.8.0.bcr.1/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module(
name = "curl",
version = "8.8.0.bcr.1",
compatibility_level = 0,
)

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "mbedtls", version = "3.6.0")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
Loading

0 comments on commit 99f76f6

Please sign in to comment.