summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2019-02-28 16:25:14 -0800
committerShentubot <shentubot@google.com>2019-02-28 16:26:14 -0800
commitf7df9d72cf1d10922ff5a55ef5664b4325439ef5 (patch)
treeb96d525992f1ef486054fdbb1597a78b5793215d
parent383078688353feb4ae3714aa4b1d79aea519f7a4 (diff)
Upgrade to Go 1.12
PiperOrigin-RevId: 236218980 Change-Id: I82cb4aeb2a56524ee1324bfea2ad41dce26db354
-rw-r--r--WORKSPACE10
-rw-r--r--pkg/sentry/platform/procid/procid_amd64.s2
-rw-r--r--pkg/sentry/platform/procid/procid_arm64.s2
3 files changed, 7 insertions, 7 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 47f3e85ba..dee249a79 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,18 +2,18 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "io_bazel_rules_go",
- urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"],
- sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
+ urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.17.1/rules_go-0.17.1.tar.gz"],
+ sha256 = "6776d68ebb897625dead17ae510eac3d5f6342367327875210df44dbe2aeeb19",
)
http_archive(
name = "bazel_gazelle",
- url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.16.0/bazel-gazelle-0.16.0.tar.gz",
- sha256 = "7949fc6cc17b5b191103e97481cf8889217263acf52e00b560683413af204fcb",
+ url = "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.17.0/bazel-gazelle-0.17.0.tar.gz",
+ sha256 = "3c681998538231a2d24d0c07ed5a7658cb72bfb5fd4bf9911157c0e9ac6a2687",
)
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
go_rules_dependencies()
-go_register_toolchains(go_version="1.11.5")
+go_register_toolchains(go_version="1.12")
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 fd88ce82e..ef3439c03 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.12
+// +build !go1.13
#include "textflag.h"
diff --git a/pkg/sentry/platform/procid/procid_arm64.s b/pkg/sentry/platform/procid/procid_arm64.s
index be65d0db0..02e907b6b 100644
--- a/pkg/sentry/platform/procid/procid_arm64.s
+++ b/pkg/sentry/platform/procid/procid_arm64.s
@@ -14,7 +14,7 @@
// +build arm64
// +build go1.8
-// +build !go1.12
+// +build !go1.13
#include "textflag.h"