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
HoloRin authored Sep 12, 2023
2 parents fd0f06c + 75083b8 commit 089a929
Show file tree
Hide file tree
Showing 109 changed files with 2,642 additions and 47 deletions.
29 changes: 11 additions & 18 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
module(
name = "bazel_central_registry",
compatibility_level = 1,
version = "0.0.0",
compatibility_level = 1,
)

bazel_dep(name = "rules_python", version = "0.17.3")

python = use_extension("@rules_python//python:extensions.bzl", "python")
bazel_dep(name = "rules_python", version = "0.25.0")

python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.toolchain(
name = "python3",
python_version = "3.11",
)

use_repo(python, "python3_toolchains")

register_toolchains(
"@python3_toolchains//:all",
is_default = True,
python_version = "3.11",
)
use_repo(python, "python_3_11", "python_versions")

pip = use_extension("@rules_python//python:extensions.bzl", "pip")

pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
pip.parse(
name = "tools_deps",
requirements_lock = "//tools:requirements_lock.txt",
hub_name = "pip",
python_version = "3.11",
requirements_lock = "//tools:requirements_lock.txt",
)

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

bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "platforms", version = "0.0.7")

bazel_dep(name = "stardoc", version = "0.5.3", 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")
13 changes: 13 additions & 0 deletions modules/apple_support/1.9.0/patches/module_dot_bazel_version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: MODULE.bazel
===================================================================
--- MODULE.bazel
+++ MODULE.bazel
@@ -1,7 +1,7 @@
module(
name = "apple_support",
- version = "0",
+ version = "1.9.0",
bazel_compatibility = [">=6.0.0"],
compatibility_level = 1,
repo_name = "build_bazel_apple_support",
)
17 changes: 17 additions & 0 deletions modules/apple_support/1.9.0/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
matrix:
platform: ["centos7", "debian10", "macos", "ubuntu2004", "windows"]

tasks:
verify_targets:
name: "Build targets under //lib"
platform: ${{ platform }}
build_targets:
- '@apple_support//lib/...'
run_tests:
name: "Run test targets"
platform: "macos"
test_targets:
- '@apple_support//test/...'
- '--'
# Needs the new toolchain
- '-@apple_support//test:linking_disable_objc_apple_link_test'
9 changes: 9 additions & 0 deletions modules/apple_support/1.9.0/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-tQbGcgCmpkR2tWFdsgyIeg/zMSisqjFIpcnlFnxKB14=",
"strip_prefix": "",
"url": "https://github.com/bazelbuild/apple_support/releases/download/1.9.0/apple_support.1.9.0.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-icmXP4eF13m+PzfZMSKk0ZOc5RPAu3uWrCzhCMsUa5k="
},
"patch_strip": 0
}
3 changes: 2 additions & 1 deletion modules/apple_support/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"1.7.0",
"1.7.1",
"1.8.0",
"1.8.1"
"1.8.1",
"1.9.0"
],
"yanked_versions": {}
}
34 changes: 34 additions & 0 deletions modules/aspect_bazel_lib/1.34.2/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"aspect-build/bazel-lib"

# replaced by export-subst during 'git archive'
VERSION = "v1.34.2"

module(
name = "aspect_bazel_lib",
version = "1.34.2" if VERSION.startswith("$Format") else VERSION,
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "platforms", version = "0.0.4")

# 0.5.4 is the first version with bzlmod support
bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc")

ext = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "ext")
use_repo(ext, "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq_toolchains", "yq_toolchains")

register_toolchains(
"@copy_directory_toolchains//:all",
"@copy_to_directory_toolchains//:all",
"@jq_toolchains//:all",
"@yq_toolchains//:all",
"@coreutils_toolchains//:all",
"@expand_template_toolchains//:all",
)

# Development-only dependencies

bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.1.0", dev_dependency = True)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Index: MODULE.bazel
===================================================================
--- MODULE.bazel
+++ MODULE.bazel
@@ -4,9 +4,9 @@
VERSION = "v1.34.2"

module(
name = "aspect_bazel_lib",
- version = "0.0.0" if VERSION.startswith("$Format") else VERSION,
+ version = "1.34.2" if VERSION.startswith("$Format") else VERSION,
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
10 changes: 10 additions & 0 deletions modules/aspect_bazel_lib/1.34.2/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
bcr_test_module:
module_path: "e2e/smoke"
matrix:
platform: ["debian10", "macos", "ubuntu2004", "windows"]
tasks:
run_tests:
name: "Run test module"
platform: ${{ platform }}
test_targets:
- "//..."
9 changes: 9 additions & 0 deletions modules/aspect_bazel_lib/1.34.2/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-tEMQvvF9M9DjSmJNu8dN5ZXTetwWVGvWEtbxeOrEJuc=",
"strip_prefix": "bazel-lib-1.34.2",
"url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.34.2/bazel-lib-v1.34.2.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-QGDwIyNER7Pim0CcRy4JfYVL+BbeW4BzRsRM+BUO8Kw="
},
"patch_strip": 0
}
31 changes: 31 additions & 0 deletions modules/aspect_bazel_lib/1.34.4/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"aspect-build/bazel-lib"

module(
name = "aspect_bazel_lib",
version = "1.34.4",
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "platforms", version = "0.0.4")

# 0.5.4 is the first version with bzlmod support
bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc")

ext = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "ext")
use_repo(ext, "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq_toolchains", "yq_toolchains")

register_toolchains(
"@copy_directory_toolchains//:all",
"@copy_to_directory_toolchains//:all",
"@jq_toolchains//:all",
"@yq_toolchains//:all",
"@coreutils_toolchains//:all",
"@expand_template_toolchains//:all",
)

# Development-only dependencies

bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.1.0", dev_dependency = True)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Index: MODULE.bazel
===================================================================
--- MODULE.bazel
+++ MODULE.bazel
@@ -1,9 +1,9 @@
"aspect-build/bazel-lib"

module(
name = "aspect_bazel_lib",
- version = "0.0.0",
+ version = "1.34.4",
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
10 changes: 10 additions & 0 deletions modules/aspect_bazel_lib/1.34.4/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
bcr_test_module:
module_path: "e2e/smoke"
matrix:
platform: ["debian10", "macos", "ubuntu2004", "windows"]
tasks:
run_tests:
name: "Run test module"
platform: ${{ platform }}
test_targets:
- "//..."
9 changes: 9 additions & 0 deletions modules/aspect_bazel_lib/1.34.4/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-iWkrGefaWrY6jvDEDGw65NTYXwYUHQXuWrguM9LmxiU=",
"strip_prefix": "bazel-lib-1.34.4",
"url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.34.4/bazel-lib-v1.34.4.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-rjC7POxjtcHrdO9AqjG8Gc+u3ZKO0dU+wbOQa1gnuEA="
},
"patch_strip": 0
}
31 changes: 31 additions & 0 deletions modules/aspect_bazel_lib/1.34.5/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"aspect-build/bazel-lib"

module(
name = "aspect_bazel_lib",
version = "1.34.5",
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "platforms", version = "0.0.4")

# 0.5.4 is the first version with bzlmod support
bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc")

ext = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "ext")
use_repo(ext, "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq_toolchains", "yq_toolchains")

register_toolchains(
"@copy_directory_toolchains//:all",
"@copy_to_directory_toolchains//:all",
"@jq_toolchains//:all",
"@yq_toolchains//:all",
"@coreutils_toolchains//:all",
"@expand_template_toolchains//:all",
)

# Development-only dependencies

bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.1.0", dev_dependency = True)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Index: MODULE.bazel
===================================================================
--- MODULE.bazel
+++ MODULE.bazel
@@ -1,9 +1,9 @@
"aspect-build/bazel-lib"

module(
name = "aspect_bazel_lib",
- version = "0.0.0",
+ version = "1.34.5",
compatibility_level = 1,
)

# Lower-bound versions of our dependencies
10 changes: 10 additions & 0 deletions modules/aspect_bazel_lib/1.34.5/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
bcr_test_module:
module_path: "e2e/smoke"
matrix:
platform: ["debian10", "macos", "ubuntu2004", "windows"]
tasks:
run_tests:
name: "Run test module"
platform: ${{ platform }}
test_targets:
- "//..."
9 changes: 9 additions & 0 deletions modules/aspect_bazel_lib/1.34.5/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-CbUamVetxWyQWiyYDW6wbwS+sdhcZltGf2WYcUA89CM=",
"strip_prefix": "bazel-lib-1.34.5",
"url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.34.5/bazel-lib-v1.34.5.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-QUfaQm+UnAA51paxzHtHd1Td3yJZcpwQfKuDg+Xmde8="
},
"patch_strip": 0
}
8 changes: 6 additions & 2 deletions modules/aspect_bazel_lib/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,13 @@
"1.32.1",
"1.33.0",
"1.34.0",
"1.34.1"
"1.34.1",
"1.34.2",
"1.34.4",
"1.34.5"
],
"yanked_versions": {
"1.31.0": "1.31.0 has a breaking change to the default yq version"
"1.31.0": "1.31.0 has a breaking change to the default yq version",
"1.34.2": "The version field has a leading 'v' due to a release automation bug"
}
}
25 changes: 25 additions & 0 deletions modules/aspect_rules_esbuild/0.15.3/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"aspect-build/rules_esbuild"

module(
name = "aspect_rules_esbuild",
version = "0.15.3",
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "gazelle", version = "0.29.0", dev_dependency = True, repo_name = "bazel_gazelle")
bazel_dep(name = "buildifier_prebuilt", version = "6.0.0.1", dev_dependency = True)
bazel_dep(name = "aspect_bazel_lib", version = "1.29.2")
bazel_dep(name = "aspect_rules_js", version = "1.29.2")
bazel_dep(name = "rules_nodejs", version = "5.8.2")
bazel_dep(name = "platforms", version = "0.0.5")

esbuild = use_extension("@aspect_rules_esbuild//esbuild:extensions.bzl", "esbuild")
esbuild.toolchain(
name = "esbuild",
esbuild_version = "0.16.7",
)
use_repo(esbuild, "esbuild_toolchains")

register_toolchains("@esbuild_toolchains//:all")
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Index: MODULE.bazel
===================================================================
--- MODULE.bazel
+++ MODULE.bazel
@@ -1,9 +1,9 @@
"aspect-build/rules_esbuild"

module(
name = "aspect_rules_esbuild",
- version = "0.0.0",
+ version = "0.15.3",
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.4.1")
10 changes: 10 additions & 0 deletions modules/aspect_rules_esbuild/0.15.3/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
bcr_test_module:
module_path: 'e2e/smoke'
matrix:
platform: ['debian10', 'macos', 'ubuntu2004', 'windows']
tasks:
run_tests:
name: 'Run test module'
platform: ${{ platform }}
test_targets:
- '//...'
9 changes: 9 additions & 0 deletions modules/aspect_rules_esbuild/0.15.3/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"integrity": "sha256-hEGYaOQ8cUwNkJ3KcwOeLyVCf8BPNS0vT3NDyjP2Des=",
"strip_prefix": "rules_esbuild-0.15.3",
"url": "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.3/rules_esbuild-v0.15.3.tar.gz",
"patches": {
"module_dot_bazel_version.patch": "sha256-6HOGY8RdlvSAEG4MlL/fPbo0ql/hE7bKH00HEsfqoDU="
},
"patch_strip": 0
}
Loading

0 comments on commit 089a929

Please sign in to comment.