*: Use forked goretk/gore module (#3597)

This allows us to update this dependency on our schedule which is important because the module relies on manually updating the known list of Go versions to function correctly. Forking allows us to keep this up to date ourselves and possibly create a new system to prevent having to perform this manual step in the future.
go-delve · Dec 12, 2023 · dda8f69 · dda8f69
1 parent f8c8b33
commit dda8f69
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/cosiner/argv v0.1.0
 	github.com/creack/pty v1.1.20
 	github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d
+	github.com/go-delve/gore v0.11.5
 	github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d
 	github.com/google/go-dap v0.11.0
-	github.com/goretk/gore v0.11.3
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mattn/go-isatty v0.0.20

diff --git a/go.sum b/go.sum
@@ -13,14 +13,14 @@ github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d h1:hUWoLdw5kvo2xC
 github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
 github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/go-delve/gore v0.11.5 h1:pcMZDA5G3k3tJEm4+szgqF4FeXLySy6NRbQ9Yx4wTaA=
+github.com/go-delve/gore v0.11.5/go.mod h1:6RBVnEUxVGkztpRY0UDUnEzS4GqETQjWrw8rhegmN4I=
 github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d h1:pxjSLshkZJGLVm0wv20f/H0oTWiq/egkoJQ2ja6LEvo=
 github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-dap v0.11.0 h1:SpAZJL41rOOvd85PuLCCLE1dteTQOyKNnn0H3DBHywo=
 github.com/google/go-dap v0.11.0/go.mod h1:HAeyoSd2WIfTfg+0GRXcFrb+RnojAtGNh+k+XTIxJDE=
-github.com/goretk/gore v0.11.3 h1:Igk+aBl3sVEp0j6paNMaNs9hXeqC5GO9YHDqVBqiWiA=
-github.com/goretk/gore v0.11.3/go.mod h1:MMkaJmF/reDsujtnLvSJBFdA5b/aZXcVKfKmMjLR+qo=
 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

diff --git a/pkg/proc/bininfo.go b/pkg/proc/bininfo.go
@@ -33,7 +33,7 @@ import (
 	"github.com/go-delve/delve/pkg/internal/gosym"
 	"github.com/go-delve/delve/pkg/logflags"
 	"github.com/go-delve/delve/pkg/proc/debuginfod"
-	"github.com/goretk/gore"
+	"github.com/go-delve/gore"
 	"github.com/hashicorp/golang-lru/simplelru"
 )
 

diff --git a/vendor/github.com/goretk/gore/.gitignore → vendor/github.com/go-delve/gore/.gitignore b/vendor/github.com/goretk/gore/.gitignore → vendor/github.com/go-delve/gore/.gitignore
diff --git a/vendor/github.com/goretk/gore/.gitmodules → vendor/github.com/go-delve/gore/.gitmodules b/vendor/github.com/goretk/gore/.gitmodules → vendor/github.com/go-delve/gore/.gitmodules
diff --git a/...or/github.com/goretk/gore/CONTRIBUTING.md → .../github.com/go-delve/gore/CONTRIBUTING.md b/...or/github.com/goretk/gore/CONTRIBUTING.md → .../github.com/go-delve/gore/CONTRIBUTING.md
diff --git a/vendor/github.com/goretk/gore/LICENSE → vendor/github.com/go-delve/gore/LICENSE b/vendor/github.com/goretk/gore/LICENSE → vendor/github.com/go-delve/gore/LICENSE
diff --git a/vendor/github.com/goretk/gore/README.md → vendor/github.com/go-delve/gore/README.md b/vendor/github.com/goretk/gore/README.md → vendor/github.com/go-delve/gore/README.md
diff --git a/vendor/github.com/goretk/gore/buildid.go → vendor/github.com/go-delve/gore/buildid.go b/vendor/github.com/goretk/gore/buildid.go → vendor/github.com/go-delve/gore/buildid.go
diff --git a/vendor/github.com/goretk/gore/doc.go → vendor/github.com/go-delve/gore/doc.go b/vendor/github.com/goretk/gore/doc.go → vendor/github.com/go-delve/gore/doc.go
diff --git a/vendor/github.com/goretk/gore/elf.go → vendor/github.com/go-delve/gore/elf.go b/vendor/github.com/goretk/gore/elf.go → vendor/github.com/go-delve/gore/elf.go
diff --git a/vendor/github.com/goretk/gore/error.go → vendor/github.com/go-delve/gore/error.go b/vendor/github.com/goretk/gore/error.go → vendor/github.com/go-delve/gore/error.go
diff --git a/vendor/github.com/goretk/gore/file.go → vendor/github.com/go-delve/gore/file.go b/vendor/github.com/goretk/gore/file.go → vendor/github.com/go-delve/gore/file.go
diff --git a/vendor/github.com/goretk/gore/function.go → vendor/github.com/go-delve/gore/function.go b/vendor/github.com/goretk/gore/function.go → vendor/github.com/go-delve/gore/function.go
diff --git a/vendor/github.com/goretk/gore/goroot.go → vendor/github.com/go-delve/gore/goroot.go b/vendor/github.com/goretk/gore/goroot.go → vendor/github.com/go-delve/gore/goroot.go
diff --git a/vendor/github.com/goretk/gore/goversion.go → vendor/github.com/go-delve/gore/goversion.go b/vendor/github.com/goretk/gore/goversion.go → vendor/github.com/go-delve/gore/goversion.go
diff --git a/...r/github.com/goretk/gore/goversion_gen.go → ...github.com/go-delve/gore/goversion_gen.go b/...r/github.com/goretk/gore/goversion_gen.go → ...github.com/go-delve/gore/goversion_gen.go
diff --git a/vendor/github.com/goretk/gore/macho.go → vendor/github.com/go-delve/gore/macho.go b/vendor/github.com/goretk/gore/macho.go → vendor/github.com/go-delve/gore/macho.go
diff --git a/vendor/github.com/goretk/gore/modinfo.go → vendor/github.com/go-delve/gore/modinfo.go b/vendor/github.com/goretk/gore/modinfo.go → vendor/github.com/go-delve/gore/modinfo.go
diff --git a/vendor/github.com/goretk/gore/moduledata.go → ...or/github.com/go-delve/gore/moduledata.go b/vendor/github.com/goretk/gore/moduledata.go → ...or/github.com/go-delve/gore/moduledata.go
diff --git a/vendor/github.com/goretk/gore/package.go → vendor/github.com/go-delve/gore/package.go b/vendor/github.com/goretk/gore/package.go → vendor/github.com/go-delve/gore/package.go
diff --git a/vendor/github.com/goretk/gore/pclntab.go → vendor/github.com/go-delve/gore/pclntab.go b/vendor/github.com/goretk/gore/pclntab.go → vendor/github.com/go-delve/gore/pclntab.go
diff --git a/vendor/github.com/goretk/gore/pe.go → vendor/github.com/go-delve/gore/pe.go b/vendor/github.com/goretk/gore/pe.go → vendor/github.com/go-delve/gore/pe.go
diff --git a/vendor/github.com/goretk/gore/stdpkg_gen.go → ...or/github.com/go-delve/gore/stdpkg_gen.go b/vendor/github.com/goretk/gore/stdpkg_gen.go → ...or/github.com/go-delve/gore/stdpkg_gen.go
diff --git a/vendor/github.com/goretk/gore/type.go → vendor/github.com/go-delve/gore/type.go b/vendor/github.com/goretk/gore/type.go → vendor/github.com/go-delve/gore/type.go
diff --git a/vendor/github.com/goretk/gore/type2.go → vendor/github.com/go-delve/gore/type2.go b/vendor/github.com/goretk/gore/type2.go → vendor/github.com/go-delve/gore/type2.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -24,15 +24,15 @@ github.com/creack/pty
 # github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d
 ## explicit; go 1.19
 github.com/derekparker/trie
+# github.com/go-delve/gore v0.11.5
+## explicit; go 1.21
+github.com/go-delve/gore
 # github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d
 ## explicit
 github.com/go-delve/liner
 # github.com/google/go-dap v0.11.0
 ## explicit; go 1.13
 github.com/google/go-dap
-# github.com/goretk/gore v0.11.3
-## explicit; go 1.21
-github.com/goretk/gore
 # github.com/hashicorp/golang-lru v1.0.2
 ## explicit; go 1.12
 github.com/hashicorp/golang-lru/simplelru