From aa9d35a814bf2e34c04893b166de49ee5b739aec Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Wed, 26 Oct 2022 12:22:12 +1100 Subject: [PATCH] Fix bazel builds on recent macOS Update `golang.org/x/sys` package to address golang/go#51706 Update bazel `rules_go` to address bazelbuild/rules_go#3199 --- bazel/deps.bzl | 4 ++-- bazel/repositories.bzl | 12 ++++++------ go.mod | 2 +- go.sum | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index a3490fe9..10007a8d 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -101,6 +101,6 @@ def jsonnet_go_dependencies(go_sdk_version = "host"): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=", - version = "v0.0.0-20200223170610-d5e6a3e2c0ae", + sum = "h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=", + version = "v0.1.0", ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index c0e70f72..b6e3f504 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -10,19 +10,19 @@ CPP_JSONNET_GITHASH = "34419d2483927ceb17cd506cad77c3c2a96e7b8c" def jsonnet_go_repositories(): http_archive( name = "io_bazel_rules_go", - sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc", + sha256 = "16e9fca53ed6bd4ff4ad76facc9b7b651a89db1689a2877d6fd7b82aa824e366", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.34.0/rules_go-v0.34.0.zip", ], ) http_archive( name = "bazel_gazelle", - sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4", + sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", ], ) http_archive( diff --git a/go.mod b/go.mod index 30cdd6cc..050c96f7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/fatih/color v1.12.0 github.com/sergi/go-diff v1.1.0 - golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect + golang.org/x/sys v0.1.0 // indirect gopkg.in/yaml.v2 v2.2.7 // indirect sigs.k8s.io/yaml v1.1.0 ) diff --git a/go.sum b/go.sum index ea72c321..780e8fd7 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=