From 110ef199ee3f5b3208ed2b65389b70c50770a07d Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Tue, 8 Aug 2023 17:41:48 +0200 Subject: [PATCH 1/3] Bump Go versions to 1.21.1 Also requires updating Gazelle. --- WORKSPACE | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 9c66602457..9543050961 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,7 +5,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() -go_register_toolchains(version = "1.20.7") +go_register_toolchains(version = "1.21.1") http_archive( name = "com_google_protobuf", @@ -71,15 +71,17 @@ bazel_skylib_workspace() http_archive( name = "bazel_gazelle", - sha256 = "178eba9540a616bda314afa25a91f195758a9fed178eda72e149eb0d20e9b670", - strip_prefix = "bazel-gazelle-9fe0a3ff751647789690293dcbb3c87ea33b7566", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://github.com/bazelbuild/bazel-gazelle/archive/9fe0a3ff751647789690293dcbb3c87ea33b7566.zip", + "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("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") +gazelle_dependencies() + go_repository( name = "com_github_google_go_github_v36", importpath = "github.com/google/go-github/v36", @@ -158,8 +160,6 @@ load("@io_bazel_rules_go//tests:grpc_repos.bzl", "grpc_dependencies") grpc_dependencies() -gazelle_dependencies() - local_repository( name = "runfiles_remote_test", path = "tests/core/runfiles/runfiles_remote_test", From 8aef0b95384f3a2dc835fb4eb886535ec3aaed5b Mon Sep 17 00:00:00 2001 From: Son Luong Ngoc Date: Mon, 11 Sep 2023 17:58:45 +0200 Subject: [PATCH 2/3] Update popular_repos - Upgrade x/crypto to v0.13.0 - Switch to use commit instead of http - Remove irrelevant excludes - Remove `darwin_tests` (never used) - Add support for `build_excludes` to exclude incompatible non-test targets - Exclude @org_golang_x_crypto//nacl/secretbox:secretbox_test --- tests/integration/popular_repos/BUILD.bazel | 17 +++++----- tests/integration/popular_repos/README.rst | 11 +++++-- .../popular_repos/popular_repos.bzl | 4 +-- .../popular_repos/popular_repos.py | 32 +++++++++---------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/tests/integration/popular_repos/BUILD.bazel b/tests/integration/popular_repos/BUILD.bazel index b2121417ea..b528656e60 100644 --- a/tests/integration/popular_repos/BUILD.bazel +++ b/tests/integration/popular_repos/BUILD.bazel @@ -30,17 +30,16 @@ test_suite( "@org_golang_x_crypto//blowfish:blowfish_test", "@org_golang_x_crypto//bn256:bn256_test", "@org_golang_x_crypto//cast5:cast5_test", - "@org_golang_x_crypto//chacha20:chacha20_test", "@org_golang_x_crypto//chacha20poly1305:chacha20poly1305_test", "@org_golang_x_crypto//cryptobyte:cryptobyte_test", "@org_golang_x_crypto//curve25519:curve25519_test", "@org_golang_x_crypto//ed25519:ed25519_test", "@org_golang_x_crypto//hkdf:hkdf_test", + "@org_golang_x_crypto//internal/chacha20:chacha20_test", "@org_golang_x_crypto//internal/subtle:subtle_test", "@org_golang_x_crypto//md4:md4_test", "@org_golang_x_crypto//nacl/auth:auth_test", "@org_golang_x_crypto//nacl/box:box_test", - "@org_golang_x_crypto//nacl/secretbox:secretbox_test", "@org_golang_x_crypto//nacl/sign:sign_test", "@org_golang_x_crypto//ocsp:ocsp_test", "@org_golang_x_crypto//openpgp:openpgp_test", @@ -59,8 +58,8 @@ test_suite( "@org_golang_x_crypto//salsa20/salsa:salsa_test", "@org_golang_x_crypto//scrypt:scrypt_test", "@org_golang_x_crypto//sha3:sha3_test", - "@org_golang_x_crypto//ssh/internal/bcrypt_pbkdf:bcrypt_pbkdf_test", "@org_golang_x_crypto//ssh/knownhosts:knownhosts_test", + "@org_golang_x_crypto//ssh/terminal:terminal_test", "@org_golang_x_crypto//tea:tea_test", "@org_golang_x_crypto//twofish:twofish_test", "@org_golang_x_crypto//xtea:xtea_test", @@ -89,6 +88,7 @@ test_suite( "@org_golang_x_net//netutil:netutil_test", "@org_golang_x_net//proxy:proxy_test", "@org_golang_x_net//publicsuffix:publicsuffix_test", + "@org_golang_x_net//route:route_test", "@org_golang_x_net//trace:trace_test", "@org_golang_x_net//webdav:webdav_test", "@org_golang_x_net//webdav/internal/xml:xml_test", @@ -105,6 +105,7 @@ test_suite( "@org_golang_x_sys//internal/unsafeheader:unsafeheader_test", "@org_golang_x_sys//plan9:plan9_test", "@org_golang_x_sys//unix/internal/mkmerge:mkmerge_test", + "@org_golang_x_sys//windows/mkwinsyscall:mkwinsyscall_test", "@org_golang_x_sys//windows/registry:registry_test", "@org_golang_x_sys//windows/svc:svc_test", "@org_golang_x_sys//windows/svc/eventlog:eventlog_test", @@ -167,8 +168,10 @@ test_suite( "@org_golang_x_tools//cmd/splitdwarf/internal/macho:macho_test", "@org_golang_x_tools//cover:cover_test", "@org_golang_x_tools//go/analysis:analysis_test", + "@org_golang_x_tools//go/analysis/passes/directive/testdata/src/a:a_test", "@org_golang_x_tools//go/analysis/passes/internal/analysisutil:analysisutil_test", "@org_golang_x_tools//go/ast/astutil:astutil_test", + "@org_golang_x_tools//go/callgraph:callgraph_test", "@org_golang_x_tools//go/callgraph/static:static_test", "@org_golang_x_tools//go/callgraph/vta/internal/trie:trie_test", "@org_golang_x_tools//go/cfg:cfg_test", @@ -190,6 +193,8 @@ test_suite( "@org_golang_x_tools//internal/jsonrpc2:jsonrpc2_test", "@org_golang_x_tools//internal/jsonrpc2/servertest:servertest_test", "@org_golang_x_tools//internal/jsonrpc2_v2:jsonrpc2_v2_test", + "@org_golang_x_tools//internal/lockedfile:lockedfile_test", + "@org_golang_x_tools//internal/lockedfile/internal/filelock:filelock_test", "@org_golang_x_tools//internal/memoize:memoize_test", "@org_golang_x_tools//internal/persistent:persistent_test", "@org_golang_x_tools//internal/proxydir:proxydir_test", @@ -244,7 +249,6 @@ build_test( "@org_golang_x_net//icmp:icmp", "@org_golang_x_net//nettest:nettest", "@org_golang_x_net//lif:lif", - "@org_golang_x_net//route:route", "@org_golang_x_sys//unix:unix", "@org_golang_x_sys//windows:windows", "@org_golang_x_text//encoding/charmap:charmap", @@ -255,12 +259,10 @@ build_test( "@org_golang_x_text//encoding/unicode/utf32:utf32", "@org_golang_x_text//encoding/unicode:unicode", "@org_golang_x_text//message/pipeline:pipeline", - "@org_golang_x_tools//blog:blog", "@org_golang_x_tools//cmd/bundle:bundle", "@org_golang_x_tools//cmd/callgraph:callgraph", "@org_golang_x_tools//cmd/file2fuzz:file2fuzz", "@org_golang_x_tools//cmd/fiximports:fiximports", - "@org_golang_x_tools//cmd/godoc:godoc", "@org_golang_x_tools//cmd/gorename:gorename", "@org_golang_x_tools//cmd/guru:guru", "@org_golang_x_tools//cmd/signature-fuzzer/fuzz-driver:fuzz-driver", @@ -282,6 +284,7 @@ build_test( "@org_golang_x_tools//go/analysis/passes/copylock:copylock", "@org_golang_x_tools//go/analysis/passes/ctrlflow:ctrlflow", "@org_golang_x_tools//go/analysis/passes/deepequalerrors:deepequalerrors", + "@org_golang_x_tools//go/analysis/passes/directive:directive", "@org_golang_x_tools//go/analysis/passes/errorsas:errorsas", "@org_golang_x_tools//go/analysis/passes/fieldalignment:fieldalignment", "@org_golang_x_tools//go/analysis/passes/findcall:findcall", @@ -331,8 +334,6 @@ build_test( "@org_golang_x_tools//go/types/objectpath:objectpath", "@org_golang_x_tools//godoc/static:static", "@org_golang_x_tools//godoc/vfs/zipfs:zipfs", - "@org_golang_x_tools//godoc:godoc", - "@org_golang_x_tools//present:present", "@org_golang_x_tools//refactor/eg:eg", "@org_golang_x_tools//refactor/importgraph:importgraph", "@org_golang_x_tools//refactor/rename:rename", diff --git a/tests/integration/popular_repos/README.rst b/tests/integration/popular_repos/README.rst index ad071a377e..66f85a843f 100644 --- a/tests/integration/popular_repos/README.rst +++ b/tests/integration/popular_repos/README.rst @@ -22,17 +22,16 @@ This runs tests from the repository `golang.org/x/crypto * @org_golang_x_net//netutil:netutil_test * @org_golang_x_net//proxy:proxy_test * @org_golang_x_net//publicsuffix:publicsuffix_test +* @org_golang_x_net//route:route_test * @org_golang_x_net//trace:trace_test * @org_golang_x_net//webdav:webdav_test * @org_golang_x_net//webdav/internal/xml:xml_test @@ -99,6 +99,7 @@ This runs tests from the repository `golang.org/x/sys * @org_golang_x_sys//internal/unsafeheader:unsafeheader_test * @org_golang_x_sys//plan9:plan9_test * @org_golang_x_sys//unix/internal/mkmerge:mkmerge_test +* @org_golang_x_sys//windows/mkwinsyscall:mkwinsyscall_test * @org_golang_x_sys//windows/registry:registry_test * @org_golang_x_sys//windows/svc:svc_test * @org_golang_x_sys//windows/svc/eventlog:eventlog_test @@ -163,8 +164,10 @@ This runs tests from the repository `golang.org/x/tools Date: Mon, 25 Sep 2023 12:58:06 +0200 Subject: [PATCH 3/3] Manually update golang.org/x/tools test BUILD file --- third_party/org_golang_x_tools-gazelle.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/third_party/org_golang_x_tools-gazelle.patch b/third_party/org_golang_x_tools-gazelle.patch index 3cb5eb24db..f3a1f2379e 100644 --- a/third_party/org_golang_x_tools-gazelle.patch +++ b/third_party/org_golang_x_tools-gazelle.patch @@ -9784,7 +9784,7 @@ diff -urN b/internal/lockedfile/BUILD.bazel c/internal/lockedfile/BUILD.bazel diff -urN b/internal/lockedfile/internal/filelock/BUILD.bazel c/internal/lockedfile/internal/filelock/BUILD.bazel --- b/internal/lockedfile/internal/filelock/BUILD.bazel 1970-01-01 00:00:00.000000000 +0000 +++ c/internal/lockedfile/internal/filelock/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000 -@@ -0,0 +1,65 @@ +@@ -0,0 +1,71 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( @@ -9799,6 +9799,12 @@ diff -urN b/internal/lockedfile/internal/filelock/BUILD.bazel c/internal/lockedf + ], + importpath = "golang.org/x/tools/internal/lockedfile/internal/filelock", + visibility = ["//:__subpackages__"], ++ deps = select({ ++ "@io_bazel_rules_go//go/platform:windows": [ ++ "@org_golang_x_sys//windows", ++ ], ++ "//conditions:default": [], ++ }), +) + +alias(