-
Notifications
You must be signed in to change notification settings - Fork 359
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Publish aspect-build/[email protected] (#994)
Co-authored-by: Derek Cormier <[email protected]>
- Loading branch information
1 parent
789f7ef
commit 5b2832d
Showing
6 changed files
with
140 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
"aspect-build/bazel-lib" | ||
|
||
module( | ||
name = "aspect_bazel_lib", | ||
version = "2.0.0-rc0", | ||
bazel_compatibility = [">=6.0.0"], | ||
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.7") | ||
|
||
# 0.5.4 is the first version with bzlmod support | ||
bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc") | ||
|
||
bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") | ||
bazel_lib_toolchains.copy_directory() | ||
bazel_lib_toolchains.copy_to_directory() | ||
bazel_lib_toolchains.jq() | ||
bazel_lib_toolchains.yq() | ||
bazel_lib_toolchains.coreutils() | ||
bazel_lib_toolchains.tar() | ||
bazel_lib_toolchains.expand_template() | ||
use_repo(bazel_lib_toolchains, "bsd_tar_toolchains", "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", | ||
# Expand bsd_tar_toolchains | ||
"@bsd_tar_toolchains//:linux_amd64_toolchain", | ||
"@bsd_tar_toolchains//:linux_arm64_toolchain", | ||
"@bsd_tar_toolchains//:windows_amd64_toolchain", | ||
# host toolchain must be last, as it's only suitable as a fallback on macos | ||
"@bsd_tar_toolchains//:host_toolchain", | ||
) | ||
|
||
host = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "host", dev_dependency = True) | ||
host.host() | ||
use_repo(host, "aspect_bazel_lib_host") | ||
|
||
# To allow /tools to be built from source | ||
# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries | ||
# along with our releases. | ||
|
||
bazel_dep( | ||
name = "gazelle", | ||
version = "0.33.0", | ||
dev_dependency = True, | ||
) | ||
bazel_dep( | ||
name = "rules_go", | ||
version = "0.41.0", | ||
repo_name = "io_bazel_rules_go", | ||
dev_dependency = True, | ||
) | ||
|
||
go_deps = use_extension( | ||
"@gazelle//:extensions.bzl", | ||
"go_deps", | ||
dev_dependency = True, | ||
) | ||
go_deps.from_file(go_mod = "//:go.mod") | ||
use_repo( | ||
go_deps, | ||
"com_github_bmatcuk_doublestar_v4", | ||
"org_golang_x_exp", | ||
) | ||
|
||
# Development-only dependencies | ||
|
||
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True) | ||
bazel_dep(name = "buildifier_prebuilt", version = "6.3.3", dev_dependency = True) |
27 changes: 27 additions & 0 deletions
27
modules/aspect_bazel_lib/2.0.0-rc0/patches/go_dev_dep.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/MODULE.bazel b/MODULE.bazel | ||
index e63fa5b..9d78a88 100644 | ||
--- a/MODULE.bazel | ||
+++ b/MODULE.bazel | ||
@@ -50,19 +50,19 @@ use_repo(host, "aspect_bazel_lib_host") | ||
bazel_dep( | ||
name = "gazelle", | ||
version = "0.33.0", | ||
- # In released versions: dev_dependency = True | ||
+ dev_dependency = True, | ||
) | ||
bazel_dep( | ||
name = "rules_go", | ||
version = "0.41.0", | ||
repo_name = "io_bazel_rules_go", | ||
- # In released versions: dev_dependency = True | ||
+ dev_dependency = True, | ||
) | ||
|
||
go_deps = use_extension( | ||
"@gazelle//:extensions.bzl", | ||
"go_deps", | ||
- # In released versions: dev_dependency = True | ||
+ dev_dependency = True, | ||
) | ||
go_deps.from_file(go_mod = "//:go.mod") | ||
use_repo( |
14 changes: 14 additions & 0 deletions
14
modules/aspect_bazel_lib/2.0.0-rc0/patches/module_dot_bazel_version.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
=================================================================== | ||
--- a/MODULE.bazel | ||
+++ b/MODULE.bazel | ||
@@ -1,9 +1,9 @@ | ||
"aspect-build/bazel-lib" | ||
|
||
module( | ||
name = "aspect_bazel_lib", | ||
- version = "0.0.0", | ||
+ version = "2.0.0-rc0", | ||
bazel_compatibility = [">=6.0.0"], | ||
compatibility_level = 1, | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: | ||
- "//..." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
"integrity": "sha256-kaz8DveY08h2Ocv9tidIRa1w7b3f2S5JrHCUTwj5f1g=", | ||
"strip_prefix": "bazel-lib-2.0.0-rc0", | ||
"url": "https://github.com/aspect-build/bazel-lib/releases/download/v2.0.0-rc0/bazel-lib-v2.0.0-rc0.tar.gz", | ||
"patches": { | ||
"go_dev_dep.patch": "sha256-KgABwDzOT+DugUHn9tHLOz05osnk2FLsS10d5zqG/M0=", | ||
"module_dot_bazel_version.patch": "sha256-kkCZCOz7NBDvNhzDZ88dFCvJ2PD1pcAMuXvL9DLKNcE=" | ||
}, | ||
"patch_strip": 1 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters