Skip to content

Commit 4713188

Browse files
Merge pull request #1319 from chizhg/update-go-1.25.10
Update Go version to 1.25.10 and upgrade dependencies
2 parents d8498c5 + 878d36b commit 4713188

42 files changed

Lines changed: 1322 additions & 5084 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
build --workspace_status_command=./hack/print-workspace-status.sh
33
run --workspace_status_command=./hack/print-workspace-status.sh
44

5+
# Force C++17 standard for compiling newer Abseil and Protobuf libraries
6+
build --cxxopt=-std=c++17
7+
build --host_cxxopt=-std=c++17
8+
59
# enable data race detection
610
test --@io_bazel_rules_go//go/config:race --test_output=errors
711

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
6.5.0

WORKSPACE

Lines changed: 63 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# gazelle:repository_macro repos.bzl%go_repositories
22
workspace(name = "com_github_googlecloudplatform_testgrid")
33

4-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
55

66
http_archive(
77
name = "io_bazel_rules_go",
8-
sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
8+
sha256 = "86d3dc8f59d253524f933aaf2f3c05896cb0b605fc35b460c0b4b039996124c6",
99
urls = [
10-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
11-
"https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
10+
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.60.0/rules_go-v0.60.0.zip",
11+
"https://github.com/bazel-contrib/rules_go/releases/download/v0.60.0/rules_go-v0.60.0.zip",
1212
],
1313
)
1414

@@ -33,9 +33,8 @@ canary_repo_infra and local_repository(
3333

3434
http_archive(
3535
name = "io_bazel_rules_docker",
36-
sha256 = "27d53c1d646fc9537a70427ad7b034734d08a9c38924cc6357cc973fed300820",
37-
strip_prefix = "rules_docker-0.24.0",
38-
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.24.0/rules_docker-v0.24.0.tar.gz"],
36+
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
37+
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"],
3938
)
4039

4140
http_archive(
@@ -47,28 +46,29 @@ http_archive(
4746

4847
http_archive(
4948
name = "bazel_gazelle",
50-
sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
49+
sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
5150
urls = [
52-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
53-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
51+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
52+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
5453
],
5554
)
5655

5756
http_archive(
5857
name = "com_google_protobuf",
59-
sha256 = "f1a83673cbcaff6346a8fba87a9c02c0f943a4a696b6c7d1b71586d97609db12",
60-
strip_prefix = "protobuf-21.1",
58+
sha256 = "10a0d58f39a1a909e95e00e8ba0b5b1dc64d02997f741151953a2b3659f6e78c",
59+
strip_prefix = "protobuf-29.0",
6160
urls = [
62-
#"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v21.1.tar.gz",
63-
"https://github.com/protocolbuffers/protobuf/archive/v21.1.tar.gz",
61+
"https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz",
6462
],
6563
)
6664

6765
http_archive(
6866
name = "rules_python",
69-
sha256 = "cdf6b84084aad8f10bf20b46b77cb48d83c319ebe6458a18e9d2cebf57807cdd",
70-
strip_prefix = "rules_python-0.8.1",
71-
url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.8.1.tar.gz",
67+
sha256 = "778aaeab3e6cfd56d681c89f5c10d7ad6bf8d2f1a72de9de55b23081b2d31618",
68+
strip_prefix = "rules_python-0.34.0",
69+
urls = [
70+
"https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
71+
],
7272
)
7373

7474
http_archive(
@@ -83,30 +83,70 @@ http_archive(
8383

8484
#### LOAD
8585

86-
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
8786
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
88-
89-
go_rules_dependencies()
90-
91-
go_register_toolchains(version = "1.18.3")
92-
87+
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
9388
load("//:repos.bzl", "go_repositories")
9489

9590
go_repositories()
9691

92+
go_rules_dependencies()
93+
94+
go_register_toolchains(version = "1.25.10")
95+
9796
gazelle_dependencies()
9897

9998
load(
10099
"@io_bazel_rules_docker//go:image.bzl",
101100
_go_image_repos = "repositories",
101+
_go_repositories = "repositories",
102102
)
103103

104104
_go_image_repos()
105105

106+
load("@rules_python//python:repositories.bzl", "py_repositories")
107+
108+
py_repositories()
109+
110+
http_archive(
111+
name = "com_google_absl",
112+
strip_prefix = "abseil-cpp-20240722.0",
113+
urls = [
114+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz",
115+
],
116+
)
117+
106118
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
107119

108120
protobuf_deps() # No options
109121

122+
http_file(
123+
name = "go_puller_linux_amd64",
124+
executable = True,
125+
sha256 = "08b8963cce9234f57055bafc7cadd1624cdce3c5990048cea1df453d7d288bc6",
126+
urls = ["https://mirror.bazel.build/storage.googleapis.com/rules_docker/aad94363e63d31d574cf701df484b3e8b868a96a/puller-linux-amd64"],
127+
)
128+
129+
http_file(
130+
name = "go_puller_darwin",
131+
executable = True,
132+
sha256 = "4855c4f5927f8fb0f885510ab3e2a166d5fa7cde765fbe9aec97dc6b2761bb22",
133+
urls = ["https://mirror.bazel.build/storage.googleapis.com/rules_docker/aad94363e63d31d574cf701df484b3e8b868a96a/puller-darwin-amd64"],
134+
)
135+
136+
http_file(
137+
name = "go_puller_linux_arm64",
138+
executable = True,
139+
sha256 = "912ee7c469b3e4bf15ba5d1f0ee500e7ec6724518862703fa8b09e4d58ce3ee6",
140+
urls = ["https://mirror.bazel.build/storage.googleapis.com/rules_docker/aad94363e63d31d574cf701df484b3e8b868a96a/puller-linux-arm64"],
141+
)
142+
143+
http_file(
144+
name = "go_puller_linux_s390x",
145+
executable = True,
146+
sha256 = "a5527b7b3b4a266e4680a4ad8939429665d4173f26b35d5d317385134369e438",
147+
urls = ["https://mirror.bazel.build/storage.googleapis.com/rules_docker/aad94363e63d31d574cf701df484b3e8b868a96a/puller-linux-s390x"],
148+
)
149+
110150
load(
111151
"@io_bazel_rules_docker//repositories:repositories.bzl",
112152
_container_repositories = "repositories",
@@ -118,8 +158,6 @@ load("@io_bazel_rules_docker//repositories:deps.bzl", _container_deps = "deps")
118158

119159
_container_deps()
120160

121-
load("@io_bazel_rules_docker//go:image.bzl", _go_repositories = "repositories")
122-
123161
_go_repositories()
124162

125163
load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_repositories")

cc/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
# This becomes the BUILD file for @local_config_cc// under non-BSD unixes.
1616

17-
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
18-
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
1917
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
18+
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
19+
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
2020

2121
package(default_visibility = ["//visibility:public"])
2222

cc/cc_toolchain_config.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
"""A Starlark cc_toolchain configuration rule"""
1616

17+
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
1718
load(
1819
"@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
1920
"action_config",
@@ -26,7 +27,6 @@ load(
2627
"variable_with_value",
2728
"with_feature_set",
2829
)
29-
load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
3030

3131
def layering_check_features(compiler):
3232
if compiler != "clang":

config/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ go_test(
7272
platform(
7373
name = "platform",
7474
constraint_values = [
75-
"@bazel_tools//platforms:linux",
76-
"@bazel_tools//platforms:x86_64",
75+
"@platforms//os:linux",
76+
"@platforms//cpu:x86_64",
7777
"@bazel_tools//tools/cpp:clang",
7878
],
7979
parents = ["@local_config_platform//:host"],

config/yamlcfg/yaml2proto.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ func pathDefault(path string, defaultFiles map[string]DefaultConfiguration, defa
8282
}
8383

8484
// ReadConfig takes multiple source paths of the following form:
85-
// If path is a local file, then the file will be parsed as YAML
86-
// If path is a directory, then all files and directories within it will be parsed.
87-
// If this directory has a default(s).yaml file, apply it to all configured entities,
88-
// after applying defaults from defaultPath.
85+
//
86+
// If path is a local file, then the file will be parsed as YAML
87+
// If path is a directory, then all files and directories within it will be parsed.
88+
// If this directory has a default(s).yaml file, apply it to all configured entities,
89+
// after applying defaults from defaultPath.
90+
//
8991
// Optionally, defaultPath points to default setting YAML
9092
// Returns a configuration proto containing the data from all of those sources
9193
func ReadConfig(paths []string, defaultpath string, strict bool) (*config.Configuration, error) {

def.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@io_bazel_rules_docker//container:image.bzl", "container_image")
1615
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
16+
load("@io_bazel_rules_docker//container:image.bzl", "container_image")
1717
load("@io_bazel_rules_docker//contrib:push-all.bzl", "container_push")
1818
load("@io_bazel_rules_docker//go:image.bzl", _go_image = "go_image")
1919

go.mod

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,66 @@ module github.com/GoogleCloudPlatform/testgrid
22

33
require (
44
bitbucket.org/creachadair/stringset v0.0.11
5-
cloud.google.com/go v0.110.7 // indirect
65
cloud.google.com/go/pubsub v1.33.0
76
cloud.google.com/go/storage v1.31.0
87
github.com/client9/misspell v0.3.4
98
github.com/fvbommel/sortorder v1.1.0
109
github.com/go-chi/chi v1.5.4
11-
github.com/go-logr/logr v1.2.4 // indirect
1210
github.com/golang/protobuf v1.5.3
1311
github.com/google/go-cmp v0.5.9
14-
github.com/google/gofuzz v1.2.0 // indirect
1512
github.com/google/uuid v1.3.0
16-
github.com/hashicorp/errwrap v1.1.0 // indirect
1713
github.com/hashicorp/go-multierror v1.1.1
1814
github.com/prometheus/client_golang v1.11.1
1915
github.com/prometheus/client_model v0.3.0
2016
github.com/sethvargo/go-retry v0.2.4
2117
github.com/sirupsen/logrus v1.9.3
2218
google.golang.org/api v0.134.0
2319
google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf
24-
google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
25-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
2620
google.golang.org/grpc v1.57.0
27-
google.golang.org/protobuf v1.31.0
21+
google.golang.org/protobuf v1.36.3
2822
k8s.io/api v0.27.4
23+
sigs.k8s.io/yaml v1.4.0
24+
)
25+
26+
require (
27+
cloud.google.com/go v0.110.7 // indirect
28+
cloud.google.com/go/compute v1.23.0 // indirect
29+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
30+
cloud.google.com/go/iam v1.1.1 // indirect
31+
github.com/beorn7/perks v1.0.1 // indirect
32+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
33+
github.com/go-logr/logr v1.2.4 // indirect
34+
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
36+
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/s2a-go v0.1.4 // indirect
38+
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
39+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
40+
github.com/hashicorp/errwrap v1.1.0 // indirect
41+
github.com/json-iterator/go v1.1.12 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
43+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44+
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/prometheus/common v0.26.0 // indirect
46+
github.com/prometheus/procfs v0.6.0 // indirect
47+
go.opencensus.io v0.24.0 // indirect
48+
golang.org/x/crypto v0.11.0 // indirect
49+
golang.org/x/net v0.12.0 // indirect
50+
golang.org/x/oauth2 v0.10.0 // indirect
51+
golang.org/x/sync v0.3.0 // indirect
52+
golang.org/x/sys v0.10.0 // indirect
53+
golang.org/x/text v0.11.0 // indirect
54+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
55+
google.golang.org/appengine v1.6.7 // indirect
56+
google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
57+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
58+
gopkg.in/inf.v0 v0.9.1 // indirect
59+
gopkg.in/yaml.v2 v2.4.0 // indirect
60+
k8s.io/apimachinery v0.27.4 // indirect
2961
k8s.io/klog/v2 v2.100.1 // indirect
3062
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
63+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
3164
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
32-
sigs.k8s.io/yaml v1.4.0
3365
)
3466

35-
go 1.14
67+
go 1.25

0 commit comments

Comments
 (0)