summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2018-08-28 09:20:17 -0700
committerShentubot <shentubot@google.com>2018-08-28 09:22:41 -0700
commit25a8e13a78ad6418a1798ec419a1b5ab2116a7f8 (patch)
tree978c4dadff99c18e6d4ee34eaf62cc9390aaf050
parentd08ccdaaad0ff00622321957aa01cac149741005 (diff)
Bump to Go 1.11
The procid offset is unchanged. PiperOrigin-RevId: 210551969 Change-Id: I33ba1ce56c2f5631b712417d870aa65ef24e6022
-rw-r--r--WORKSPACE6
-rw-r--r--pkg/sentry/platform/procid/procid_amd64.s2
2 files changed, 4 insertions, 4 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 45b120be4..302acc973 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,8 +1,8 @@
# Load go bazel rules and gazelle.
http_archive(
name = "io_bazel_rules_go",
- url = "https://github.com/bazelbuild/rules_go/releases/download/0.14.0/rules_go-0.14.0.tar.gz",
- sha256 = "5756a4ad75b3703eb68249d50e23f5d64eaf1593e886b9aa931aa6e938c4e301",
+ url = "https://github.com/bazelbuild/rules_go/releases/download/0.15.1/rules_go-0.15.1.tar.gz",
+ sha256 = "5f3b0304cdf0c505ec9e5b3c4fc4a87b5ca21b13d8ecc780c97df3d1809b9ce6",
)
http_archive(
name = "bazel_gazelle",
@@ -11,7 +11,7 @@ http_archive(
)
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
go_rules_dependencies()
-go_register_toolchains(go_version="1.10.3")
+go_register_toolchains(go_version="1.11")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
gazelle_dependencies()
diff --git a/pkg/sentry/platform/procid/procid_amd64.s b/pkg/sentry/platform/procid/procid_amd64.s
index ead4e3d91..5b1ba1f24 100644
--- a/pkg/sentry/platform/procid/procid_amd64.s
+++ b/pkg/sentry/platform/procid/procid_amd64.s
@@ -14,7 +14,7 @@
// +build amd64
// +build go1.8
-// +build !go1.11
+// +build !go1.12
#include "textflag.h"