From a92d01ac52e0d76fe9bff8091dd3ecc7aa01991c Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Tue, 20 Jun 2023 12:45:30 -0500 Subject: [PATCH] bazel: upgrade to 6.2.1 Epic: CRDB-8308 Release note: None --- .bazelversion | 2 +- DEPS.bzl | 10 ++----- build/bazelutil/distdir_files.bzl | 2 +- build/patches/com_github_knz_go_libedit.patch | 29 ------------------- go.mod | 2 +- go.sum | 4 +-- 6 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 build/patches/com_github_knz_go_libedit.patch diff --git a/.bazelversion b/.bazelversion index 3d2392f5ae58..1f625f42aa57 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -cockroachdb/5.4.1 +cockroachdb/6.2.1 diff --git a/DEPS.bzl b/DEPS.bzl index 1eb070460883..433baff940a8 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -5393,14 +5393,10 @@ def go_deps(): name = "com_github_knz_go_libedit", build_file_proto_mode = "disable_global", importpath = "github.com/knz/go-libedit", - patch_args = ["-p1"], - patches = [ - "@com_github_cockroachdb_cockroach//build/patches:com_github_knz_go_libedit.patch", - ], - sha256 = "d603b4baf8ab6608a79f56edf2e5a24c5bf96af06f665002f47267d8401a7614", - strip_prefix = "github.com/knz/go-libedit@v1.10.2-0.20230308124748-6f1b59dd42bc", + sha256 = "de5a038a75f45e5c4d19321d39b85b7007b73eb77f9ec3fcca16798236fb081f", + strip_prefix = "github.com/knz/go-libedit@v1.10.2-0.20230621133438-5f2b2e7387c5", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/go-libedit/com_github_knz_go_libedit-v1.10.2-0.20230308124748-6f1b59dd42bc.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/go-libedit/com_github_knz_go_libedit-v1.10.2-0.20230621133438-5f2b2e7387c5.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 1fe363520a7b..a4ef9df2a5d1 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -686,7 +686,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/klauspost/pgzip/com_github_klauspost_pgzip-v1.2.5.zip": "1143b6417d4bb46d26dc8e6223407b84b6cd5f32e5d705cd4a9fb142220ce4ba", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/bubbline/com_github_knz_bubbline-v0.0.0-20230422210153-e176cdfe1c43.zip": "b9699be473d5dc3c1254f0e9a26f77a06cc0455135b72c2b82d85146bcfe5863", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/catwalk/com_github_knz_catwalk-v0.1.4.zip": "f422f7974090494e54226262586c7b34fe57b33ab7d668151ca55eba8e309c1e", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/go-libedit/com_github_knz_go_libedit-v1.10.2-0.20230308124748-6f1b59dd42bc.zip": "d603b4baf8ab6608a79f56edf2e5a24c5bf96af06f665002f47267d8401a7614", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/go-libedit/com_github_knz_go_libedit-v1.10.2-0.20230621133438-5f2b2e7387c5.zip": "de5a038a75f45e5c4d19321d39b85b7007b73eb77f9ec3fcca16798236fb081f", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/lipgloss-convert/com_github_knz_lipgloss_convert-v0.1.0.zip": "f9f9ffa12e7df4007cc60c87327d47ad42d1f71a80e360af4014674138de8bef", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/knz/strtime/com_github_knz_strtime-v0.0.0-20200318182718-be999391ffa9.zip": "c1e1b06c339798387413af1444f06f31a483d4f5278ab3a91b6cd5d7cd8d91a1", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/konsorten/go-windows-terminal-sequences/com_github_konsorten_go_windows_terminal_sequences-v1.0.3.zip": "429b01413b972b108ea86bbde3d5e660913f3e8099190d07ccfb2f186bc6d837", diff --git a/build/patches/com_github_knz_go_libedit.patch b/build/patches/com_github_knz_go_libedit.patch deleted file mode 100644 index 8e25a7f9feb2..000000000000 --- a/build/patches/com_github_knz_go_libedit.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN a/unix/BUILD.bazel b/unix/BUILD.bazel ---- a/unix/BUILD.bazel 1969-12-31 19:00:00.000000000 -0500 -+++ b/unix/BUILD.bazel 2000-01-01 00:00:00.000000000 -0000 -@@ -1,7 +1,7 @@ - load("@io_bazel_rules_go//go:def.bzl", "go_library") - - cc_library( -- name = "libedit_unix_cdeps", -+ name = "edit", - srcs = select({ - "@io_bazel_rules_go//go/platform:android": glob([ - "src/*.c", -@@ -45,6 +45,7 @@ - "//conditions:default": "shim", - }), - copts = ["-DGO_LIBEDIT_NO_BUILD"], -+ visibility = ["//visibility:public"], - ) - - go_library( -@@ -86,7 +87,7 @@ - "wrap-wcsdup.c", - ], - cdeps = [ -- ":libedit_unix_cdeps", -+ ":edit", - ], - cgo = True, - clinkopts = select({ diff --git a/go.mod b/go.mod index 35b9a230d37c..bfbee4b1afbc 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( github.com/klauspost/compress v1.15.15 github.com/klauspost/pgzip v1.2.5 github.com/knz/bubbline v0.0.0-20230422210153-e176cdfe1c43 - github.com/knz/go-libedit v1.10.2-0.20230308124748-6f1b59dd42bc + github.com/knz/go-libedit v1.10.2-0.20230621133438-5f2b2e7387c5 github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 github.com/kr/pretty v0.3.0 github.com/kr/text v0.2.0 diff --git a/go.sum b/go.sum index ed424ea63a86..1574f22f2ee9 100644 --- a/go.sum +++ b/go.sum @@ -1519,8 +1519,8 @@ github.com/knz/bubbline v0.0.0-20230422210153-e176cdfe1c43 h1:uhwfuoL9LDMUGlxcs3 github.com/knz/bubbline v0.0.0-20230422210153-e176cdfe1c43/go.mod h1:ucXvyrucVy4jp/4afdKWNW1TVO73GMI72VNINzyT678= github.com/knz/catwalk v0.1.4 h1:GgCxHbPp+nzyZBJcNL/CJd1aba4ACoeuI1lnsshAPkY= github.com/knz/catwalk v0.1.4/go.mod h1:Q+Yj4ny4AXgrOOyWyDGY/HJzmbGH8MFnsUqvCAiUT5s= -github.com/knz/go-libedit v1.10.2-0.20230308124748-6f1b59dd42bc h1:I7VuCOZXntHLQVZhEj/nrDqUl853RzJhef3Mwx7/iqI= -github.com/knz/go-libedit v1.10.2-0.20230308124748-6f1b59dd42bc/go.mod h1:dmDChGdWopkB61HsdDN0/fxKAMIYljKTu+AG9uc4qVY= +github.com/knz/go-libedit v1.10.2-0.20230621133438-5f2b2e7387c5 h1:62iTw+D4JtoXL7yp4S5Ruyc82qmbWdnwuuSZ3tmcuSw= +github.com/knz/go-libedit v1.10.2-0.20230621133438-5f2b2e7387c5/go.mod h1:dmDChGdWopkB61HsdDN0/fxKAMIYljKTu+AG9uc4qVY= github.com/knz/lipgloss-convert v0.1.0 h1:qUPUt6r8mqvi9DIV3nBPu3kEmFyHrZtXzv0BlPBPLNQ= github.com/knz/lipgloss-convert v0.1.0/go.mod h1:S14GmtoiW/VAHqB7xEzuZOt0/G6GQ2dfjJN0fHpm30Q= github.com/knz/strtime v0.0.0-20200318182718-be999391ffa9 h1:GQE1iatYDRrIidq4Zf/9ZzKWyrTk2sXOYc1JADbkAjQ=