Skip to content

Commit 2467806

Browse files
jarondljarondl
authored
Merge pull request #103 from jarondl/bzlfmt
Formatting fixes and depenendency updates.
2 parents 758cc68 + 86ef601 commit 2467806

File tree

11 files changed

+296
-6526
lines changed

11 files changed

+296
-6526
lines changed

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.3.2
1+
8.3.1

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module(
22
name = "rpmpack",
3-
version = "0.6.0",
3+
version = "0.7.1",
44
)
55

6-
bazel_dep(name = "rules_go", version = "0.46.0")
7-
bazel_dep(name = "gazelle", version = "0.35.0")
6+
bazel_dep(name = "rules_go", version = "0.55.1")
7+
bazel_dep(name = "gazelle", version = "0.44.0")
88

99
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
1010
go_deps.from_file(go_mod = "//:go.mod")

‎MODULE.bazel.lock‎

Lines changed: 135 additions & 2221 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloudbuild.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
steps:
2-
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
2+
- name: 'gcr.io/cloud-builders/bazel:8.3.1'
33
entrypoint: 'bazel'
44
args: ['build', '--curses=no', '//:all']
5-
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
5+
- name: 'gcr.io/cloud-builders/bazel:8.3.1'
66
entrypoint: 'bazel'
77
args: ['test', '--test_output=all', '--curses=no', '//:all']
8-
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
8+
- name: 'gcr.io/cloud-builders/bazel:8.3.1'
99
entrypoint: 'bazel'
1010
dir: 'example_bazel'
1111
args: ['build', '--curses=no', '//:all']
12-
- name: 'gcr.io/cloud-builders/bazel:7.3.2'
12+
- name: 'gcr.io/cloud-builders/bazel:8.3.1'
1313
entrypoint: 'bazel'
1414
dir: 'example_bazel'
1515
args: ['test', '--test_output=all', '--curses=no', '//:all']

‎cmd/tar2rpm/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
)
3030

3131
const (
32-
// "Magic" filename: instead of reading/writing to that file use stdin/stdout (can still be used via './-').
32+
// DashStdinStdout is the pseudo-filename for stdin/stdout.
3333
DashStdinStdout = "-"
3434
)
3535

‎example_bazel/.bazelversion‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎example_bazel/.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.bazelversion

‎example_bazel/MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rpmpack_example_bazel",
3-
version = "0.6.0",
3+
version = "0.7.1",
44
)
55

66
##############################################################################
@@ -22,10 +22,10 @@ python.toolchain(
2222
# End of workaround.
2323
##############################################################################
2424

25-
bazel_dep(name = "rpmpack", version = "0.6.0")
25+
bazel_dep(name = "rpmpack")
2626
local_path_override(
2727
module_name = "rpmpack",
2828
path = "../",
2929
)
3030

31-
bazel_dep(name = "rules_pkg", version = "1.0.1")
31+
bazel_dep(name = "rules_pkg", version = "1.1.0")

‎example_bazel/MODULE.bazel.lock‎

Lines changed: 129 additions & 4275 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example_bazel/testing.bzl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
def _docker_run_impl(ctx):
32
out = ctx.actions.declare_file(ctx.label.name)
43
args = ctx.actions.args()
@@ -11,6 +10,7 @@ def _docker_run_impl(ctx):
1110
inputs = [ctx.file.tar],
1211
executable = ctx.file._script,
1312
arguments = [args],
13+
mnemonic = "DockerRun",
1414
)
1515
return DefaultInfo(files = depset([out]))
1616

@@ -63,13 +63,13 @@ diff_test_expand = rule(
6363
implementation = _diff_test_impl,
6464
)
6565

66-
def docker_diff(name,cmd, golden, tar=":rpms", image="", base=""):
66+
def docker_diff(name, cmd, golden, tar = ":rpms", image = "", base = ""):
6767
docker_run(
68-
name = name + "_run",
69-
testonly = True,
70-
tar = tar,
71-
image = image,
72-
cmd = cmd,
68+
name = name + "_run",
69+
testonly = True,
70+
tar = tar,
71+
image = image,
72+
cmd = cmd,
7373
)
7474
diff_test_expand(
7575
name = name + "_diff",

0 commit comments

Comments
 (0)