Skip to content

Commit d42f759

Browse files
authored
Merge pull request #125 from tweag/renovate/rules_proto-7.x
chore(deps): update dependency rules_proto to v7
2 parents 54c7a72 + e7e2680 commit d42f759

File tree

5 files changed

+45
-24
lines changed

5 files changed

+45
-24
lines changed

.github/workflows/workflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
if: ${{ !matrix.enable-bzlmod }}
143143
uses: tweag/run-nix-shell@v0
144144
with:
145-
run: bazel run //:buildifier-diff
145+
run: bazel test //:buildifier-check
146146

147147
all_ci_tests:
148148
runs-on: ubuntu-latest

BUILD.bazel

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
1+
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")
22

33
exports_files(["defs.bzl"])
44

5-
buildifier(
6-
name = "buildifier-diff",
7-
mode = "diff",
5+
buildifier_test(
6+
name = "buildifier-check",
87
)
98

109
buildifier(

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ stack_snapshot = use_extension(
1010
"stack_snapshot",
1111
)
1212
use_repo(stack_snapshot, "stackage")
13+
1314
stack_snapshot.package(name = "directory")
1415
stack_snapshot.package(name = "filepath")
1516
stack_snapshot.package(name = "json")

WORKSPACE

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,45 @@ workspace(name = "io_tweag_gazelle_cabal")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

5+
##########################
6+
# rules_java preamble
7+
##########################
8+
9+
http_archive(
10+
name = "rules_proto",
11+
sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4",
12+
strip_prefix = "rules_proto-7.1.0",
13+
url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz",
14+
)
15+
16+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
17+
18+
rules_proto_dependencies()
19+
20+
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
21+
22+
rules_proto_setup()
23+
24+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
25+
26+
rules_proto_toolchains()
27+
28+
http_archive(
29+
name = "rules_java",
30+
sha256 = "7b0d9ba216c821ee8697dedc0f9d0a705959ace462a3885fe9ba0347ba950111",
31+
urls = [
32+
"https://github.com/bazelbuild/rules_java/releases/download/6.5.1/rules_java-6.5.1.tar.gz",
33+
],
34+
)
35+
36+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
37+
38+
rules_java_dependencies()
39+
40+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
41+
42+
rules_java_toolchains()
43+
544
##########################
645
# rules_nixpkgs preamble
746
##########################
@@ -184,25 +223,6 @@ gazelle_dependencies()
184223
# Buildifier preamble
185224
#######################
186225

187-
http_archive(
188-
name = "rules_proto",
189-
sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
190-
strip_prefix = "rules_proto-6.0.2",
191-
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz",
192-
)
193-
194-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
195-
196-
rules_proto_dependencies()
197-
198-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
199-
200-
rules_proto_setup()
201-
202-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
203-
204-
rules_proto_toolchains()
205-
206226
http_archive(
207227
name = "com_github_bazelbuild_buildtools",
208228
sha256 = "53119397bbce1cd7e4c590e117dcda343c2086199de62932106c80733526c261",

example/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ stack_snapshot = use_extension(
1818
"stack_snapshot",
1919
)
2020
use_repo(stack_snapshot, "stackage", "stackage-exe")
21+
2122
stack_snapshot.snapshot(local_snapshot = "@io_tweag_gazelle_cabal//:snapshot-%s.yaml" % GHC_VERSION)
2223

2324
# TODO these should be generated by Gazelle

0 commit comments

Comments
 (0)