From c1da81f03a43b6935d042c3683262ea1a5815920 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Fri, 6 Dec 2024 16:43:30 +0000 Subject: [PATCH 1/3] Update doublestar to a version that works with the latest Gazelle --- gazelle/deps.bzl | 13 +++---------- gazelle/go.mod | 2 +- gazelle/go.sum | 2 ++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl index 948d61e5ae..5dd4ed7569 100644 --- a/gazelle/deps.bzl +++ b/gazelle/deps.bzl @@ -14,16 +14,9 @@ "This file managed by `bazel run //:gazelle_update_repos`" -load( - "@bazel_gazelle//:deps.bzl", - _go_repository = "go_repository", -) +load("@bazel_gazelle//:deps.bzl", "go_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -def go_repository(name, **kwargs): - if name not in native.existing_rules(): - _go_repository(name = name, **kwargs) - def python_stdlib_list_deps(): "Fetch python stdlib list dependencies" http_archive( @@ -70,8 +63,8 @@ def go_deps(): go_repository( name = "com_github_bmatcuk_doublestar_v4", importpath = "github.com/bmatcuk/doublestar/v4", - sum = "h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=", - version = "v4.6.1", + sum = "h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=", + version = "v4.7.1", ) go_repository( diff --git a/gazelle/go.mod b/gazelle/go.mod index 4b65e71d67..f993458c7a 100644 --- a/gazelle/go.mod +++ b/gazelle/go.mod @@ -6,7 +6,7 @@ require ( github.com/bazelbuild/bazel-gazelle v0.31.1 github.com/bazelbuild/buildtools v0.0.0-20231103205921-433ea8554e82 github.com/bazelbuild/rules_go v0.41.0 - github.com/bmatcuk/doublestar/v4 v4.6.1 + github.com/bmatcuk/doublestar/v4 v4.7.1 github.com/emirpasic/gods v1.18.1 github.com/ghodss/yaml v1.0.0 github.com/smacker/go-tree-sitter v0.0.0-20240422154435-0628b34cbf9c diff --git a/gazelle/go.sum b/gazelle/go.sum index 46e0127e8f..52faaaa4c6 100644 --- a/gazelle/go.sum +++ b/gazelle/go.sum @@ -8,6 +8,8 @@ github.com/bazelbuild/rules_go v0.41.0 h1:JzlRxsFNhlX+g4drDRPhIaU5H5LnI978wdMJ0v github.com/bazelbuild/rules_go v0.41.0/go.mod h1:TMHmtfpvyfsxaqfL9WnahCsXMWDMICTw7XeK9yVb+YU= github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= +github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= From 0da0eee73d88544ce66ddae7b0cfc15eafa92483 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Wed, 18 Dec 2024 11:15:30 +0000 Subject: [PATCH 2/3] Respond to review comments --- CHANGELOG.md | 2 +- gazelle/deps.bzl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bdc5e4483..7d394567a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ Unreleased changes template. {#v0-0-0-changed} ### Changed -* Nothing changed. +* (deps) doublestar 4.7.1 (required for recent Gazelle versions) {#v0-0-0-fixed} ### Fixed diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl index 5dd4ed7569..a7ea188143 100644 --- a/gazelle/deps.bzl +++ b/gazelle/deps.bzl @@ -14,9 +14,13 @@ "This file managed by `bazel run //:gazelle_update_repos`" -load("@bazel_gazelle//:deps.bzl", "go_repository") +load("@bazel_gazelle//:deps.bzl", _go_repository = "go_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +def go_repository(name, **kwargs): + if name not in native.existing_rules(): + _go_repository(name = name, **kwargs) + def python_stdlib_list_deps(): "Fetch python stdlib list dependencies" http_archive( From 5ad0d97f23b74277ea76ebc0364410a87d3008f1 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Thu, 19 Dec 2024 12:27:21 +0000 Subject: [PATCH 3/3] Fix formatting --- gazelle/deps.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gazelle/deps.bzl b/gazelle/deps.bzl index 9d953ed821..fbb5285a4c 100644 --- a/gazelle/deps.bzl +++ b/gazelle/deps.bzl @@ -18,8 +18,8 @@ load("@bazel_gazelle//:deps.bzl", _go_repository = "go_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def go_repository(name, **kwargs): - if name not in native.existing_rules(): - _go_repository(name = name, **kwargs) + if name not in native.existing_rules(): + _go_repository(name = name, **kwargs) def python_stdlib_list_deps(): "Fetch python stdlib list dependencies"