diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/go_branch.sh | 2 | ||||
| -rw-r--r-- | tools/go_generics/generics.go | 2 | ||||
| -rw-r--r-- | tools/go_generics/globals/BUILD | 2 | ||||
| -rw-r--r-- | tools/go_generics/imports.go | 2 | ||||
| -rw-r--r-- | tools/go_stateify/defs.bzl | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/tools/go_branch.sh b/tools/go_branch.sh index 8ea6a6d8d..d9e79401d 100755 --- a/tools/go_branch.sh +++ b/tools/go_branch.sh @@ -19,6 +19,7 @@ set -eo pipefail # Discovery the package name from the go.mod file. declare -r gomod="$(pwd)/go.mod" declare -r module=$(cat "${gomod}" | grep -E "^module" | cut -d' ' -f2) +declare -r gosum="$(pwd)/go.sum" # Check that gopath has been built. declare -r gopath_dir="$(pwd)/bazel-bin/gopath/src/${module}" @@ -63,6 +64,7 @@ git merge --allow-unrelated-histories --no-commit --strategy ours ${head} # Sync the entire gopath_dir and go.mod. rsync --recursive --verbose --delete --exclude .git --exclude README.md -L "${gopath_dir}/" . cp "${gomod}" . +cp "${gosum}" . # There are a few solitary files that can get left behind due to the way bazel # constructs the gopath target. Note that we don't find all Go files here diff --git a/tools/go_generics/generics.go b/tools/go_generics/generics.go index ca414d8cb..4e5cc53a2 100644 --- a/tools/go_generics/generics.go +++ b/tools/go_generics/generics.go @@ -98,7 +98,7 @@ import ( "regexp" "strings" - "gvisor.googlesource.com/gvisor/tools/go_generics/globals" + "gvisor.dev/gvisor/tools/go_generics/globals" ) var ( diff --git a/tools/go_generics/globals/BUILD b/tools/go_generics/globals/BUILD index 6628132f5..74853c7d2 100644 --- a/tools/go_generics/globals/BUILD +++ b/tools/go_generics/globals/BUILD @@ -8,6 +8,6 @@ go_library( "globals_visitor.go", "scope.go", ], - importpath = "gvisor.googlesource.com/gvisor/tools/go_generics/globals", + importpath = "gvisor.dev/gvisor/tools/go_generics/globals", visibility = ["//tools/go_generics:__pkg__"], ) diff --git a/tools/go_generics/imports.go b/tools/go_generics/imports.go index 3a7230c97..148dc7216 100644 --- a/tools/go_generics/imports.go +++ b/tools/go_generics/imports.go @@ -23,7 +23,7 @@ import ( "go/token" "strconv" - "gvisor.googlesource.com/gvisor/tools/go_generics/globals" + "gvisor.dev/gvisor/tools/go_generics/globals" ) type importedPackage struct { diff --git a/tools/go_stateify/defs.bzl b/tools/go_stateify/defs.bzl index 70ce73d7b..11ccfae44 100644 --- a/tools/go_stateify/defs.bzl +++ b/tools/go_stateify/defs.bzl @@ -76,7 +76,7 @@ go_stateify = rule( "package": attr.string(mandatory = True), "out": attr.output(mandatory = True), "_tool": attr.label(executable = True, cfg = "host", default = Label("//tools/go_stateify:stateify")), - "_statepkg": attr.string(default = "gvisor.googlesource.com/gvisor/pkg/state"), + "_statepkg": attr.string(default = "gvisor.dev/gvisor/pkg/state"), }, ) |