From 81fbfceea82a9b8efb28e4567f62b51c2224167f Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Mon, 13 Mar 2023 14:22:37 -0500 Subject: [PATCH] Update rules_go to v0.38.1 and go_version to 1.19.7 (#12055) * Update rules_go to v0.38.1 * Bump go version --------- Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- WORKSPACE | 8 ++++---- nogo_config.json | 6 ++++++ third_party/io_bazel_rules_go_test.patch | 14 +++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5d15a822f..4c3b2c73f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -73,10 +73,10 @@ http_archive( # Expose internals of go_test for custom build transitions. "//third_party:io_bazel_rules_go_test.patch", ], - sha256 = "ae013bf35bd23234d1dea46b079f1e05ba74ac0321423830119d3e787ec73483", + sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.36.0/rules_go-v0.36.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.36.0/rules_go-v0.36.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip", ], ) @@ -151,7 +151,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() go_register_toolchains( - go_version = "1.19.4", + go_version = "1.19.7", nogo = "@//:nogo", ) diff --git a/nogo_config.json b/nogo_config.json index f4c7fe52c..e6b79e1b2 100644 --- a/nogo_config.json +++ b/nogo_config.json @@ -182,5 +182,11 @@ ".*_test\\.go": "Tests are ok (for now)", "tools/analyzers/ineffassign/ineffassign\\.go": "3rd party code with a massive switch statement" } + }, + "shift": { + "exclude_files": { + "external/.*": "Third party code", + "rules_go_work-.*": "Third party code" + } } } diff --git a/third_party/io_bazel_rules_go_test.patch b/third_party/io_bazel_rules_go_test.patch index a05be86a0..6b918487a 100644 --- a/third_party/io_bazel_rules_go_test.patch +++ b/third_party/io_bazel_rules_go_test.patch @@ -1,22 +1,22 @@ diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl -index 1dfd1555..eeffefca 100644 +index 413a19da..b289f52f 100644 --- a/go/private/rules/test.bzl +++ b/go/private/rules/test.bzl -@@ -187,7 +187,7 @@ def _go_test_impl(ctx): - testing.TestEnvironment(env), +@@ -189,7 +189,7 @@ def _go_test_impl(ctx): + run_environment_info, ] - + -_go_test_kwargs = { +go_test_kwargs = { "implementation": _go_test_impl, "attrs": { "data": attr.label_list( -@@ -447,7 +447,7 @@ _go_test_kwargs = { +@@ -471,7 +471,7 @@ _go_test_kwargs = { """, } - + -go_test = rule(**_go_test_kwargs) +go_test = rule(**go_test_kwargs) - + def _recompile_external_deps(go, external_source, internal_archive, library_labels): """Recompiles some archives in order to split internal and external tests.