From 04ec893b5d5c075ce57a8fa37d35c3d92dae0f9e Mon Sep 17 00:00:00 2001 From: Mostyn Bramley-Moore Date: Sun, 10 Sep 2023 21:03:30 +0200 Subject: [PATCH] Upgrade to go 1.21.1 --- .bazelci/buildkite-install-go.sh | 2 +- .github/workflows/golangci-lint.yml | 2 +- WORKSPACE | 35 +++++++++++++------ .../build/bazel/remote/asset/v1/BUILD.bazel | 8 ++--- .../bazel/remote/execution/v2/BUILD.bazel | 14 ++++---- server/BUILD.bazel | 8 ++--- utils/grpcreadclient/BUILD.bazel | 2 +- 7 files changed, 43 insertions(+), 28 deletions(-) diff --git a/.bazelci/buildkite-install-go.sh b/.bazelci/buildkite-install-go.sh index a2232c087..95a35880b 100755 --- a/.bazelci/buildkite-install-go.sh +++ b/.bazelci/buildkite-install-go.sh @@ -2,7 +2,7 @@ set -euo pipefail -pkg=go1.20.7.linux-amd64.tar.gz +pkg=go1.21.1.linux-amd64.tar.gz wget -o "$HOME/$pkg" "https://golang.org/dl/$pkg" 1>&2 tar -xv -C "$HOME" -f "$pkg" 1>&2 diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index dd33806e2..c49315548 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: '1.20.7' + go-version: '1.21.1' - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/WORKSPACE b/WORKSPACE index bdbd8d33e..05319893d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,28 +1,45 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +http_archive( + name = "googleapis", + sha256 = "9d1a930e767c93c825398b8f8692eca3fe353b9aaadedfbcf1fca2282c85df88", + strip_prefix = "googleapis-64926d52febbf298cb82a8f472ade4a3969ba922", + urls = [ + "https://github.com/googleapis/googleapis/archive/64926d52febbf298cb82a8f472ade4a3969ba922.zip", + ], +) + +load("@googleapis//:repository_rules.bzl", "switched_rules_by_language") + +switched_rules_by_language( + name = "com_google_googleapis_imports", +) + http_archive( name = "io_bazel_rules_go", - sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") + http_archive( name = "bazel_gazelle", - sha256 = "727f3e4edd96ea20c29e8c2ca9e8d2af724d8c7778e7923a854b2c80952bc405", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") go_rules_dependencies() -go_register_toolchains(version = "1.20.7") +go_register_toolchains(version = "1.21.1") http_archive( name = "rules_proto", @@ -44,8 +61,6 @@ load("//:deps.bzl", "go_dependencies") # gazelle:repository_macro deps.bzl%go_dependencies go_dependencies() -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") - go_repository( name = "com_github_aws_aws_sdk_go", importpath = "github.com/aws/aws-sdk-go", diff --git a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/bazel/remote/asset/v1/BUILD.bazel index ef4028ffe..82cfaa452 100644 --- a/genproto/build/bazel/remote/asset/v1/BUILD.bazel +++ b/genproto/build/bazel/remote/asset/v1/BUILD.bazel @@ -8,10 +8,10 @@ go_library( deps = [ "//genproto/build/bazel/remote/execution/v2:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", - "@go_googleapis//google/rpc:status_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@com_github_golang_protobuf//ptypes/duration", + "@com_github_golang_protobuf//ptypes/timestamp", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/build/bazel/remote/execution/v2/BUILD.bazel index 48ad9fbd3..7c92315c1 100644 --- a/genproto/build/bazel/remote/execution/v2/BUILD.bazel +++ b/genproto/build/bazel/remote/execution/v2/BUILD.bazel @@ -8,13 +8,13 @@ go_library( deps = [ "//genproto/build/bazel/semver:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", - "@go_googleapis//google/api:annotations_go_proto", - "@go_googleapis//google/longrunning:longrunning_go_proto", - "@go_googleapis//google/rpc:status_go_proto", - "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", + "@com_github_golang_protobuf//ptypes/any", + "@com_github_golang_protobuf//ptypes/duration", + "@com_github_golang_protobuf//ptypes/timestamp", + "@com_github_golang_protobuf//ptypes/wrappers", + "@org_golang_google_genproto//googleapis/longrunning:go_default_library", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/server/BUILD.bazel b/server/BUILD.bazel index 626d326e8..1286be262 100644 --- a/server/BUILD.bazel +++ b/server/BUILD.bazel @@ -29,9 +29,9 @@ go_library( "@com_github_mostynb_go_grpc_compression//snappy:go_default_library", "@com_github_mostynb_go_grpc_compression//zstd:go_default_library", "@com_github_mostynb_zstdpool_syncpool//:go_default_library", - "@go_googleapis//google/bytestream:bytestream_go_proto", - "@go_googleapis//google/rpc:code_go_proto", - "@go_googleapis//google/rpc:status_go_proto", + "@org_golang_google_genproto_googleapis_bytestream//:go_default_library", + "@org_golang_google_genproto_googleapis_rpc//code:go_default_library", + "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//credentials:go_default_library", @@ -63,7 +63,7 @@ go_test( "//utils:go_default_library", "@com_github_google_uuid//:go_default_library", "@com_github_klauspost_compress//zstd:go_default_library", - "@go_googleapis//google/bytestream:bytestream_go_proto", + "@org_golang_google_genproto_googleapis_bytestream//:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//credentials/insecure:go_default_library", diff --git a/utils/grpcreadclient/BUILD.bazel b/utils/grpcreadclient/BUILD.bazel index 6764c31f1..e0014b9f9 100644 --- a/utils/grpcreadclient/BUILD.bazel +++ b/utils/grpcreadclient/BUILD.bazel @@ -8,7 +8,7 @@ go_library( deps = [ "//genproto/build/bazel/remote/execution/v2:go_default_library", "@com_github_google_uuid//:go_default_library", - "@go_googleapis//google/bytestream:bytestream_go_proto", + "@org_golang_google_genproto_googleapis_bytestream//:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//credentials:go_default_library",