Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

Update to go 1.13.10 #314

Merged
merged 1 commit into from
Apr 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_bazel_rules_go",
sha256 = "7b9bbe3ea1fccb46dcfa6c3f3e29ba7ec740d8733370e21cdc8937467b4a4349",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.20.2/rules_go-v0.20.2.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.4/rules_go-v0.22.4.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.22.4/rules_go-v0.22.4.tar.gz",
],
sha256 = "b9aa86ec08a292b97ec4591cf578e020b35f98e12173bbd4a921f84f583aebd9",
)

http_archive(
name = "bazel_gazelle",
sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz",
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz",
],
sha256 = "86c6d481b3f7aedc1d60c1c211c6f76da282ae197c3b3160f54bd3a8f847896f",
)

load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")

go_rules_dependencies()

go_register_toolchains(
go_version = "1.13.4",
go_version = "1.13.10",
)

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
Expand Down Expand Up @@ -69,6 +69,9 @@ container_pull(

#=============================================================================
# etcd rules

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")

http_file(
name = "etcd_2_2_1_tar",
sha256 = "59f7985c81b6bc551246c165c2fd83e33a063875e4e0c61920b1d90a4910f462",
Expand Down
12 changes: 9 additions & 3 deletions pkg/locking/lock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@ import (
"io/ioutil"
"path/filepath"
"testing"

"k8s.io/klog"
)

func init() {
flag.Set("logtostderr", "true")
flag.Set("v", "2")
flag.Parse()
logflags := flag.NewFlagSet("testing", flag.ExitOnError)

klog.InitFlags(logflags)

logflags.Set("logtostderr", "true")
logflags.Set("v", "2")
logflags.Parse([]string{})
}

func checkLocks(t *testing.T, l1, l2 Lock) {
Expand Down
10 changes: 7 additions & 3 deletions test/integration/clusterformation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ import (
)

func init() {
flag.Set("logtostderr", "true")
flag.Set("v", "2")
flag.Parse()
logflags := flag.NewFlagSet("testing", flag.ExitOnError)

klog.InitFlags(logflags)

logflags.Set("logtostderr", "true")
logflags.Set("v", "2")
logflags.Parse([]string{})
}

func TestClusterWithOneMember(t *testing.T) {
Expand Down