Skip to content

Commit

Permalink
Bump Aspect CLI dep to github.com/aspect-build/aspect-cli v1.202449.18 (
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan authored Dec 16, 2024
1 parent 94af8dc commit 9e84373
Show file tree
Hide file tree
Showing 12 changed files with 804 additions and 1,097 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.2
7.4.0
3 changes: 0 additions & 3 deletions .github/workflows/ci.bazelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Bazel settings to apply on CI only
# Included with a --bazelrc option in the call to bazel in main.yml
build --announce_rc
build --disk_cache=~/.cache/bazel
build --repository_cache=~/.cache/bazel-repo
test --test_output=errors
test --test_env=XDG_CACHE_HOME
18 changes: 0 additions & 18 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Bazel caches
uses: actions/cache@v3
with:
path: |
~/.cache/bazel
~/.cache/bazel-repo
key: bazel-cache-${{ hashFiles('**/*.go', '**/BUILD.bazel', '**/*.bzl', 'WORKSPACE') }}
restore-keys: bazel-cache-
- name: Go cache
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.mod', '**/go.sum') }}
restore-keys: ${{ runner.os }}-go-
- name: Build
env:
XDG_CACHE_HOME: ~/.cache/bazel-repo
run: bazel --bazelrc=.github/workflows/ci.bazelrc --bazelrc=.bazelrc build //...
10 changes: 0 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Bazel caches
uses: actions/cache@v3
with:
path: |
~/.cache/bazel
~/.cache/bazel-repo
key: >-
bazel-cache-${{ hashFiles('**/*.go', '**/BUILD.bazel', '**/*.bzl',
'WORKSPACE') }}
restore-keys: bazel-cache-
- name: Build release artifacts
run: |
if [ -n "$(git status --porcelain)" ]; then
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/bazel-*
MODULE.bazel.lock
13 changes: 7 additions & 6 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@bazel_gazelle//:def.bzl", "gazelle")
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("//release:release.bzl", "local_plugin")

# Run this target to update the go_* rules in this file
Expand All @@ -11,6 +11,7 @@ gazelle(name = "gazelle")
gazelle(
name = "update_go_deps",
args = [
"-build_file_proto_mode=disable_global",
"-from_file=go.mod",
"-to_macro=go.bzl%deps",
"-prune",
Expand All @@ -22,13 +23,13 @@ gazelle(
go_library(
name = "main_lib",
srcs = ["plugin.go"],
importpath = "github.com/aspect-build/aspect-cli-plugin-template",
importpath = "github.com/aspect-build/plugin-augment-error",
visibility = ["//:__subpackages__"],
deps = [
"@build_aspect_cli//bazel/buildeventstream",
"@build_aspect_cli//pkg/ioutils",
"@build_aspect_cli//pkg/plugin/sdk/v1alpha3/config",
"@build_aspect_cli//pkg/plugin/sdk/v1alpha3/plugin",
"@com_github_aspect_build_aspect_cli//bazel/buildeventstream",
"@com_github_aspect_build_aspect_cli//pkg/ioutils",
"@com_github_aspect_build_aspect_cli//pkg/plugin/sdk/v1alpha4/config",
"@com_github_aspect_build_aspect_cli//pkg/plugin/sdk/v1alpha4/plugin",
"@com_github_hashicorp_go_plugin//:go-plugin",
"@in_gopkg_yaml_v2//:yaml_v2",
],
Expand Down
Empty file added MODULE.bazel
Empty file.
54 changes: 23 additions & 31 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,63 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "com_google_protobuf",
sha256 = "d0f5f605d0d656007ce6c8b5a82df3037e1d8fe8b121ed42e536f569dec16113",
strip_prefix = "protobuf-3.14.0",
urls = [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz",
],
sha256 = "6fbe2e6f703bcd3a246529c2cab586ca12a98c4e641f5f71d51fde09eb48e9e7",
strip_prefix = "protobuf-27.1",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v27.1.tar.gz"]
)

http_archive(
name = "bazel_skylib",
sha256 = "58f558d04a936cade1d4744d12661317e51f6a21e3dd7c50b96dc14f3fa3b87d",
strip_prefix = "bazel-skylib-df3c9e2735f02a7fe8cd80db4db00fec8e13d25f",
urls = [
"https://github.com/bazelbuild/bazel-skylib/archive/df3c9e2735f02a7fe8cd80db4db00fec8e13d25f.tar.gz",
],
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz"],
)

http_archive(
name = "io_bazel_rules_go",
sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip",
],
sha256 = "0936c9bc3c4321ee372cb8f66dd972d368cb940ed01a9ba9fd7debcf0093f09b",
urls = ["https://github.com/bazel-contrib/rules_go/releases/download/v0.51.0/rules_go-v0.51.0.zip"],
)

http_archive(
name = "bazel_gazelle",
sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
],
integrity = "sha256-qAiTKSrh146u7dUNHKuY8kKhfj1XQbG5+1i1/Z0tV7w=",
urls = ["https://github.com/bazel-contrib/bazel-gazelle/releases/download/v0.40.0/bazel-gazelle-v0.40.0.tar.gz"],
)

http_archive(
name = "rules_proto",
sha256 = "9fc210a34f0f9e7cc31598d109b5d069ef44911a82f507d5a88716db171615a8",
strip_prefix = "rules_proto-f7a30f6f80006b591fa7c437fe5a951eb10bcbcf",
urls = ["https://github.com/bazelbuild/rules_proto/archive/f7a30f6f80006b591fa7c437fe5a951eb10bcbcf.tar.gz"],
sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8",
strip_prefix = "rules_proto-7.0.2",
url = "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz",
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

protobuf_deps()

load("@io_bazel_rules_go//extras:embed_data_deps.bzl", "go_embed_data_dependencies")
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_embed_data_dependencies()
go_register_toolchains(version = "1.23.4")

go_register_toolchains(version = "1.19.1")

load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")

rules_proto_dependencies()

rules_proto_toolchains()
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")

rules_proto_setup()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
load("//:go.bzl", _go_repositories = "deps")

# gazelle:repository_macro go.bzl%deps
_go_repositories()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

gazelle_dependencies()
Loading

0 comments on commit 9e84373

Please sign in to comment.