Skip to content

Commit a25422d

Browse files
Update all deps (#820)
- update all deps, will close all dependabot PRs - make auto-tag happen on patch --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 2540a2d commit a25422d

File tree

16 files changed

+63
-495
lines changed

16 files changed

+63
-495
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.3.2
1+
6.1.1

.github/actions/github-tag-action/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -o pipefail
44

55
# config
6-
default_semvar_bump=${DEFAULT_BUMP:-minor}
6+
default_semvar_bump=${DEFAULT_BUMP:-patch}
77
with_v=${WITH_V:-true}
88
release_branches=${RELEASE_BRANCHES:-}
99
custom_tag=${CUSTOM_TAG:-}

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99

1010
env:
1111
# Keep these versions in sync with the Dockerfile
12-
BDR_VER: '5.1.0'
13-
GO_VER: '1.19.3'
14-
PGG_VER: 'v1.28.1'
15-
PROTOC_VER: '21.9'
12+
BDR_VER: '6.0.1'
13+
GO_VER: '1.19.x'
14+
PGG_VER: 'v1.30.0'
15+
PROTOC_VER: '22.2'
1616
PYTHON_VER: '3.8'
1717
TEST_TAG: protoc-gen-validate:${{ github.sha }}
1818

.github/workflows/commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
- uses: actions/setup-go@v3
3434
with:
35-
go-version: "1.19.3"
35+
go-version: "1.19.x"
3636
cache: true
3737

3838
- uses: actions/setup-python@v4

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ RUN apt update \
2525
&& apt clean
2626

2727
# bazel
28-
ENV BAZEL_VER=5.3.2
28+
ENV BAZEL_VER=6.1.1
2929
RUN wget -q -O bazel https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/bazel-${BAZEL_VER}-linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "x86_64") \
3030
&& chmod +x bazel \
3131
&& mv bazel usr/local/bin/bazel
3232

3333
# protoc
34-
ENV PROTOC_VER=21.9
34+
ENV PROTOC_VER=22.2
3535
RUN export PROTOC_REL=protoc-${PROTOC_VER}-linux-$([ $(uname -m) = "aarch64" ] && echo "aarch" || echo "x86")_64.zip \
3636
&& wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/${PROTOC_REL} \
3737
&& unzip ${PROTOC_REL} -d protoc \
@@ -43,20 +43,20 @@ RUN export PROTOC_REL=protoc-${PROTOC_VER}-linux-$([ $(uname -m) = "aarch64" ] &
4343
ENV GOROOT /usr/local/go
4444
ENV GOPATH /go
4545
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
46-
RUN export GORELEASE=go1.19.3.linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "amd64").tar.gz \
46+
RUN export GORELEASE=go1.19.5.linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "amd64").tar.gz \
4747
&& wget -q https://dl.google.com/go/$GORELEASE \
4848
&& tar -C $(dirname $GOROOT) -xzf $GORELEASE \
4949
&& rm $GORELEASE \
5050
&& mkdir -p $GOPATH/{src,bin,pkg}
5151

5252
# protoc-gen-go
53-
ENV PGG_VER=v1.28.1
53+
ENV PGG_VER=v1.30.0
5454
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@${PGG_VER} \
5555
&& rm -rf $(go env GOCACHE) \
5656
&& rm -rf $(go env GOMODCACHE)
5757

5858
# buildozer
59-
ENV BDR_VER=5.1.0
59+
ENV BDR_VER=6.0.1
6060
RUN go install github.com/bazelbuild/buildtools/buildozer@${BDR_VER} \
6161
&& rm -rf $(go env GOCACHE) \
6262
&& rm -rf $(go env GOMODCACHE)

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bin/golint:
5353
GOBIN=$(shell pwd)/bin go install golang.org/x/lint/golint
5454

5555
bin/protoc-gen-go:
56-
GOBIN=$(shell pwd)/bin go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
56+
GOBIN=$(shell pwd)/bin go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0
5757

5858
bin/harness:
5959
cd tests && go build -o ../bin/harness ./harness/executor

Tools.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Licensed under the Apache License, Version 2.0 (the "License")
22

33
bazelisk@v := github.com/bazelbuild/[email protected]
4-
protoc@v := github.com/protocolbuffers/protobuf@v21.9
5-
protoc-gen-go@v := google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
4+
protoc@v := github.com/protocolbuffers/protobuf@v22.2
5+
protoc-gen-go@v := google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0

bazel/dependency_imports.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def _pgv_pip_dependencies():
1515
def _pgv_go_dependencies():
1616
go_rules_dependencies()
1717
go_register_toolchains(
18-
version = "1.19.3",
18+
version = "1.19.5",
1919
)
2020
gazelle_dependencies()
2121

bazel/repositories.bzl

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ def pgv_dependencies(maven_repos = _DEFAULT_REPOSITORIES):
88
if not native.existing_rule("io_bazel_rules_go"):
99
http_archive(
1010
name = "io_bazel_rules_go",
11-
sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
11+
sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
1212
urls = [
13-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
14-
"https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
13+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
14+
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
1515
],
1616
)
1717

1818
if not native.existing_rule("bazel_gazelle"):
1919
http_archive(
2020
name = "bazel_gazelle",
21-
sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
21+
sha256 = "ecba0f04f96b4960a5b250c8e8eeec42281035970aa8852dda73098274d14a1d",
2222
urls = [
23-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
24-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
23+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
24+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
2525
],
2626
)
2727

dependencies.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ def go_third_party():
392392
go_repository(
393393
name = "org_golang_google_protobuf",
394394
importpath = "google.golang.org/protobuf",
395-
sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
396-
version = "v1.28.1",
395+
sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=",
396+
version = "v1.30.0",
397397
)
398398
go_repository(
399399
name = "org_golang_x_crypto",

example-workspace/dependencies.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ def go_third_party():
392392
go_repository(
393393
name = "org_golang_google_protobuf",
394394
importpath = "google.golang.org/protobuf",
395-
sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
396-
version = "v1.28.1",
395+
sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=",
396+
version = "v1.30.0",
397397
)
398398
go_repository(
399399
name = "org_golang_x_crypto",

go.mod

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
module github.com/envoyproxy/protoc-gen-validate
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/iancoleman/strcase v0.2.0
77
github.com/lyft/protoc-gen-star/v2 v2.0.1
88
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
9-
golang.org/x/net v0.7.0
10-
golang.org/x/tools v0.4.0
11-
google.golang.org/protobuf v1.28.1
9+
golang.org/x/net v0.8.0
10+
golang.org/x/tools v0.7.0
11+
google.golang.org/protobuf v1.30.0
1212
)
1313

1414
require (
15-
github.com/spf13/afero v1.9.2 // indirect
16-
golang.org/x/mod v0.7.0 // indirect
17-
golang.org/x/sys v0.5.0 // indirect
18-
golang.org/x/text v0.7.0 // indirect
19-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
15+
github.com/spf13/afero v1.3.3 // indirect
16+
golang.org/x/mod v0.9.0 // indirect
17+
golang.org/x/sys v0.6.0 // indirect
18+
golang.org/x/text v0.8.0 // indirect
2019
)
2120

2221
retract [v0.6.9, v0.6.12] // Published accidentally

0 commit comments

Comments
 (0)