deps: upgrade bazel & bazel rules

- bazel 4.2.0 -> 5.1.0 Also upgrade a few other bazel dependencies: - rules_go 0.29.0 -> 0.31.0 - rules_pkg 0.4.0 -> 0.6.0 - bazel_gomock to HEAD~1 (as of now) GitOrigin-RevId: 47d46659002f06d880902c4b5d67fe8eef4b0d81
scionproto · Apr 8, 2022 · 7decb3b · 7decb3b
1 parent 4279b4c
commit 7decb3b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,6 +1,8 @@
 build --workspace_status_command=./tools/bazel-build-env --show_timestamps --remote_cache=grpc://localhost:9092 --experimental_remote_downloader=grpc://localhost:9092  --incompatible_default_to_explicit_init_py
 test --incompatible_default_to_explicit_init_py
-build --javabase=@remotejdk11_linux//:jdk --host_javabase=@remotejdk11_linux//:jdk --java_runtime_version=remotejdk_11
+
+# java version for java_binary and java_test rules (used by antlr)
+build --java_runtime_version=remotejdk_11
 
 test:race --@io_bazel_rules_go//go/config:race
 test:unit --test_tag_filters=unit --build_tests_only --print_relative_test_log_paths

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-4.2.0
+5.1.0
diff --git a/WORKSPACE b/WORKSPACE
@@ -32,10 +32,10 @@ lint_setup({
 # Bazel rules for Golang
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f",
+    sha256 = "f2dcd210c7095febe54b804bb1cd3a58fe8435a909db2ec04e31542631cf715c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.31.0.zip",
     ],
 )
 
@@ -56,18 +56,27 @@ http_archive(
     ],
 )
 
-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
-load("//:tool_deps.bzl", "tool_deps")
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
 go_rules_dependencies()
 
+load("//:tool_deps.bzl", "tool_deps")
+
 tool_deps()
 
 # gazelle:repository_macro go_deps.bzl%go_deps
 load("//:go_deps.bzl", "go_deps")
 
 go_deps()
 
+## Explictly override xerrors: https://github.com/bazelbuild/bazel-gazelle/issues/1217
+go_repository(
+    name = "org_golang_x_xerrors",
+    importpath = "golang.org/x/xerrors",
+    sum = "h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=",
+    version = "v0.0.0-20200804184101-5ec99f83aff1",
+)
+
 gazelle_dependencies()
 
 # XXX Needs to be before rules_docker
@@ -88,10 +97,10 @@ pip_install(
 
 http_archive(
     name = "rules_pkg",
-    sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
+    sha256 = "62eeb544ff1ef41d786e329e1536c1d541bb9bcad27ae984d57f18f314018e66",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
-        "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.6.0/rules_pkg-0.6.0.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.6.0/rules_pkg-0.6.0.tar.gz",
     ],
 )
 
@@ -113,9 +122,9 @@ rules_antlr_dependencies("4.9.3")
 
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "59536e6ae64359b716ba9c46c39183403b01eabfbd57578e84398b4829ca499a",
-    strip_prefix = "rules_docker-0.22.0",
-    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.22.0/rules_docker-v0.22.0.tar.gz"],
+    sha256 = "85ffff62a4c22a74dbd98d05da6cf40f497344b3dbf1e1ab0a37ab2a1a6ca014",
+    strip_prefix = "rules_docker-0.23.0",
+    urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.23.0/rules_docker-v0.23.0.tar.gz"],
 )
 
 load("@io_bazel_rules_docker//repositories:repositories.bzl", container_repositories = "repositories")
@@ -229,10 +238,10 @@ http_archive(
 
 http_archive(
     name = "com_github_jmhodges_bazel_gomock",
-    sha256 = "2da16771642ce7f75a8d620a1029b83ee29b206c6665bb8c92f003b427e35dbf",
-    strip_prefix = "bazel_gomock-4f2ee840432b1a08ccc46ee4f2c1f5a2bad8fade",
+    sha256 = "692421b0c5e04ae4bc0bfff42fb1ce8671fe68daee2b8d8ea94657bb1fcddc0a",
+    strip_prefix = "bazel_gomock-fde78c91cf1783cc1e33ba278922ba67a6ee2a84",
     urls = [
-        "https://github.com/jmhodges/bazel_gomock/archive/4f2ee840432b1a08ccc46ee4f2c1f5a2bad8fade.tar.gz",
+        "https://github.com/jmhodges/bazel_gomock/archive/fde78c91cf1783cc1e33ba278922ba67a6ee2a84.tar.gz",
     ],
 )
 

diff --git a/go_deps.bzl b/go_deps.bzl
@@ -2000,12 +2000,6 @@ def go_deps():
         sum = "h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=",
         version = "v0.1.5",
     )
-    go_repository(
-        name = "org_golang_x_xerrors",
-        importpath = "golang.org/x/xerrors",
-        sum = "h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=",
-        version = "v0.0.0-20200804184101-5ec99f83aff1",
-    )
     go_repository(
         name = "org_uber_go_atomic",
         importpath = "go.uber.org/atomic",

diff --git a/nogo.json b/nogo.json
@@ -50,7 +50,8 @@
     },
     "printf": {
         "exclude_files": {
-            "/com_github_cloudflare_sidh/": ""
+            "/com_github_cloudflare_sidh/": "",
+            "/com_github_client9_misspell/": ""
         }
     },
     "stringintconv": {