From b5a3b5d5cdd4d1f311b4d820e57787f329b13f4f Mon Sep 17 00:00:00 2001 From: Anup Chenthamarakshan Date: Fri, 13 Aug 2021 18:48:53 +0000 Subject: [PATCH] Upgrade to Go 1.16.7 Summary: List of commits: https://github.com/golang/go/compare/go1.16.6...go1.16.7 GitOrigin-RevId: bba132848dc8e9d630b1043c194ad484421432c4 --- build_tools/bazel/external_workspace.bzl | 8 ++++---- build_tools/go/BUILD | 22 +++++++++++----------- build_tools/go/BUILD.in | 22 +++++++++++----------- build_tools/go/env.py | 2 +- build_tools/go/go_test_wrapper.sh | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/build_tools/bazel/external_workspace.bzl b/build_tools/bazel/external_workspace.bzl index cd641f9d..254455ce 100644 --- a/build_tools/bazel/external_workspace.bzl +++ b/build_tools/bazel/external_workspace.bzl @@ -11,7 +11,7 @@ DEFAULT_EXTERNAL_URLS = { "com_github_plougher_squashfs_tools": ["https://github.com/plougher/squashfs-tools/archive/4.4.tar.gz"], "cpython_27": ["https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz"], "cpython_38": ["https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz"], - "go_1_16_6_linux_amd64_tar_gz": ["https://dl.google.com/go/go1.16.6.linux-amd64.tar.gz"], + "go_1_16_7_linux_amd64_tar_gz": ["https://dl.google.com/go/go1.16.7.linux-amd64.tar.gz"], "io_pypa_pip_whl": ["https://files.pythonhosted.org/packages/54/0c/d01aa759fdc501a58f431eb594a17495f15b88da142ce14b5845662c13f3/pip-20.0.2-py2.py3-none-any.whl"], "io_pypa_setuptools_whl": ["https://files.pythonhosted.org/packages/f9/d3/955738b20d3832dfa3cd3d9b07e29a8162edb480bf988332f5e6e48ca444/setuptools-44.0.0-py2.py3-none-any.whl"], "io_pypa_wheel_whl": ["https://files.pythonhosted.org/packages/8c/23/848298cccf8e40f5bbb59009b32848a4c38f4e7f3364297ab3c3e2e2cd14/wheel-0.34.2-py2.py3-none-any.whl"], @@ -32,9 +32,9 @@ DEFAULT_EXTERNAL_URLS = { def drte_deps(urls = DEFAULT_EXTERNAL_URLS): http_archive( - name = "go_1_16_6_linux_amd64_tar_gz", - urls = urls["go_1_16_6_linux_amd64_tar_gz"], - sha256 = "be333ef18b3016e9d7cb7b1ff1fdb0cac800ca0be4cf2290fe613b3d069dfe0d", + name = "go_1_16_7_linux_amd64_tar_gz", + urls = urls["go_1_16_7_linux_amd64_tar_gz"], + sha256 = "7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04", build_file = filename_from_label("//build_tools/go:BUILD.go-dist"), ) diff --git a/build_tools/go/BUILD b/build_tools/go/BUILD index 4d5b1c53..0bc66490 100644 --- a/build_tools/go/BUILD +++ b/build_tools/go/BUILD @@ -21,16 +21,16 @@ dbx_py_library( go_toolchain( name = "go1.16", - asm = "@go_1_16_6_linux_amd64_tar_gz//:asm", - asm_inputs = "@go_1_16_6_linux_amd64_tar_gz//:asm-inputs", - cgo = "@go_1_16_6_linux_amd64_tar_gz//:cgo", - compile = "@go_1_16_6_linux_amd64_tar_gz//:compile", - cover = "@go_1_16_6_linux_amd64_tar_gz//:cover", - include_dir = "external/go_1_16_6_linux_amd64_tar_gz/go/pkg/include", - link = "@go_1_16_6_linux_amd64_tar_gz//:link", - pack = "@go_1_16_6_linux_amd64_tar_gz//:pack", - stdlib = "@go_1_16_6_linux_amd64_tar_gz//:stdlib", - stdlib_race = "@go_1_16_6_linux_amd64_tar_gz//:stdlib-race", + asm = "@go_1_16_7_linux_amd64_tar_gz//:asm", + asm_inputs = "@go_1_16_7_linux_amd64_tar_gz//:asm-inputs", + cgo = "@go_1_16_7_linux_amd64_tar_gz//:cgo", + compile = "@go_1_16_7_linux_amd64_tar_gz//:compile", + cover = "@go_1_16_7_linux_amd64_tar_gz//:cover", + include_dir = "external/go_1_16_7_linux_amd64_tar_gz/go/pkg/include", + link = "@go_1_16_7_linux_amd64_tar_gz//:link", + pack = "@go_1_16_7_linux_amd64_tar_gz//:pack", + stdlib = "@go_1_16_7_linux_amd64_tar_gz//:stdlib", + stdlib_race = "@go_1_16_7_linux_amd64_tar_gz//:stdlib-race", taglist = [ "go1.1", "go1.2", @@ -58,7 +58,7 @@ dbx_sh_binary( srcs = ["go_test_wrapper.sh"], data = [ "//go/src/dropbox/build_tools/gojunit/gojunit", - "@go_1_16_6_linux_amd64_tar_gz//:test2json", + "@go_1_16_7_linux_amd64_tar_gz//:test2json", ] + select({ "//build_tools:coverage-enabled": ["//go/src/dropbox/build_tools/gocov2cobertura"], "//conditions:default": [], diff --git a/build_tools/go/BUILD.in b/build_tools/go/BUILD.in index 2d6f3748..e65df157 100644 --- a/build_tools/go/BUILD.in +++ b/build_tools/go/BUILD.in @@ -12,16 +12,16 @@ dbx_py_library( go_toolchain( name = "go1.16", - asm = "@go_1_16_6_linux_amd64_tar_gz//:asm", - asm_inputs = "@go_1_16_6_linux_amd64_tar_gz//:asm-inputs", - cgo = "@go_1_16_6_linux_amd64_tar_gz//:cgo", - compile = "@go_1_16_6_linux_amd64_tar_gz//:compile", - cover = "@go_1_16_6_linux_amd64_tar_gz//:cover", - include_dir = "external/go_1_16_6_linux_amd64_tar_gz/go/pkg/include", - link = "@go_1_16_6_linux_amd64_tar_gz//:link", - pack = "@go_1_16_6_linux_amd64_tar_gz//:pack", - stdlib = "@go_1_16_6_linux_amd64_tar_gz//:stdlib", - stdlib_race = "@go_1_16_6_linux_amd64_tar_gz//:stdlib-race", + asm = "@go_1_16_7_linux_amd64_tar_gz//:asm", + asm_inputs = "@go_1_16_7_linux_amd64_tar_gz//:asm-inputs", + cgo = "@go_1_16_7_linux_amd64_tar_gz//:cgo", + compile = "@go_1_16_7_linux_amd64_tar_gz//:compile", + cover = "@go_1_16_7_linux_amd64_tar_gz//:cover", + include_dir = "external/go_1_16_7_linux_amd64_tar_gz/go/pkg/include", + link = "@go_1_16_7_linux_amd64_tar_gz//:link", + pack = "@go_1_16_7_linux_amd64_tar_gz//:pack", + stdlib = "@go_1_16_7_linux_amd64_tar_gz//:stdlib", + stdlib_race = "@go_1_16_7_linux_amd64_tar_gz//:stdlib-race", taglist = [ "go1.1", "go1.2", @@ -49,7 +49,7 @@ dbx_sh_binary( srcs = ["go_test_wrapper.sh"], data = [ "//go/src/dropbox/build_tools/gojunit/gojunit", - "@go_1_16_6_linux_amd64_tar_gz//:test2json", + "@go_1_16_7_linux_amd64_tar_gz//:test2json", ] + select({ "//build_tools:coverage-enabled": ["//go/src/dropbox/build_tools/gocov2cobertura"], "//conditions:default": [], diff --git a/build_tools/go/env.py b/build_tools/go/env.py index fc3d400d..c48f9d9a 100644 --- a/build_tools/go/env.py +++ b/build_tools/go/env.py @@ -28,7 +28,7 @@ def make_go_env(ensure_goroot=True): } bazel_ws_root = "bazel-" + os.path.basename(ws) - GOROOT = os.path.join(ws, bazel_ws_root, "external/go_1_16_6_linux_amd64_tar_gz/go") + GOROOT = os.path.join(ws, bazel_ws_root, "external/go_1_16_7_linux_amd64_tar_gz/go") if ensure_goroot and not os.path.isdir(GOROOT): _ensure_goroot_exists(GOROOT) diff --git a/build_tools/go/go_test_wrapper.sh b/build_tools/go/go_test_wrapper.sh index 7c22c941..0de61e83 100755 --- a/build_tools/go/go_test_wrapper.sh +++ b/build_tools/go/go_test_wrapper.sh @@ -20,7 +20,7 @@ set +e retcode=${PIPESTATUS[0]} set -e -"$RUNFILES/../dbx_build_tools/../go_1_16_6_linux_amd64_tar_gz/go/pkg/tool/linux_amd64/test2json" < "$temp" -t | "$RUNFILES/../dbx_build_tools/go/src/dropbox/build_tools/gojunit/gojunit/gojunit" -target "$target" +"$RUNFILES/../dbx_build_tools/../go_1_16_7_linux_amd64_tar_gz/go/pkg/tool/linux_amd64/test2json" < "$temp" -t | "$RUNFILES/../dbx_build_tools/go/src/dropbox/build_tools/gojunit/gojunit/gojunit" -target "$target" if [[ -n "$COVERAGE_OUTPUT_FILE" ]]; then "$RUNFILES/../dbx_build_tools/go/src/dropbox/build_tools/gocov2cobertura/gocov2cobertura" < "$coverage_out" > "$COVERAGE_OUTPUT_FILE"