Skip to content

Commit

Permalink
Merge pull request #178 from fejta/minor
Browse files Browse the repository at this point in the history
Update repo-infra dependencies
  • Loading branch information
k8s-ci-robot authored Mar 3, 2020
2 parents dccb5aa + 423fa56 commit f08c9e0
Show file tree
Hide file tree
Showing 8 changed files with 402 additions and 96 deletions.
3 changes: 3 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ build:remote --remote_timeout=3600
# Alt: --google_credentials=some_file.json
build:remote --google_default_credentials=true

# Improve cache hit rate
build:remote --incompatible_strict_action_env=true

# Minimize what is downloaded
build:inmemory --experimental_inmemory_jdeps_files
build:inmemory --experimental_inmemory_dotd_files
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ load("//:load.bzl", "repositories")

repositories()

load("//:repos.bzl", "configure", "go_repositories")
load("//:repos.bzl", "configure", "repo_infra_go_repositories")

configure()

go_repositories()
repo_infra_go_repositories()
2 changes: 1 addition & 1 deletion defs/deb.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def deb_data(name, goarch = "amd64", data = [], tags = None, visibility = None):
deps = []
for i, info in enumerate(data):
dname = "%s-deb-data-%s-%s" % (name, goarch, i)
deps += [dname]
deps.append(dname)
pkg_tar(
name = dname,
srcs = select({"@io_bazel_rules_go//go/platform:" + goarch: info["files"]}),
Expand Down
9 changes: 5 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ module k8s.io/repo-infra
go 1.13

require (
github.com/bazelbuild/bazel-gazelle v0.18.2
github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89
github.com/golangci/golangci-lint v1.23.3
golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
github.com/bazelbuild/bazel-gazelle v0.20.0
github.com/bazelbuild/buildtools v0.0.0-20200228172928-c9d9e342afdb
github.com/golangci/golangci-lint v1.23.7
golang.org/x/build v0.0.0-20200302185339-bb8466fe872a
golang.org/x/tools v0.0.0-20200221191710-57f3fb51f507 // indirect
k8s.io/klog v1.0.0
)
127 changes: 114 additions & 13 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions hack/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ sh_test(
"@//:all-srcs",
_GO,
_GOLANGCI_LINT,
"@go_sdk//:files",
],
tags = ["lint"],
)
Expand Down
50 changes: 39 additions & 11 deletions load.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,33 @@ def repositories():
if not native.existing_rule("bazel_toolchains"):
http_archive(
name = "bazel_toolchains",
sha256 = "4d348abfaddbcee0c077fc51bb1177065c3663191588ab3d958f027cbfe1818b",
strip_prefix = "bazel-toolchains-2.1.0",
sha256 = "b5a8039df7119d618402472f3adff8a1bd0ae9d5e253f53fcc4c47122e91a3d2",
strip_prefix = "bazel-toolchains-2.1.1",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/2.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.1/bazel-toolchains-2.1.1.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/2.1.1.tar.gz",
],
)

if not native.existing_rule("com_google_protobuf"):
http_archive(
name = "com_google_protobuf",
strip_prefix = "protobuf-3.11.3",
sha256 = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
sha256 = "a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9",
strip_prefix = "protobuf-3.11.4",
urls = [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz",
],
)

if not native.existing_rule("io_bazel_rules_go"):
http_archive(
name = "io_bazel_rules_go",
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.21.2/rules_go-v0.21.2.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
],
sha256 = "f99a9d76e972e0c8f935b2fe6d0d9d778f67c760c6d2400e23fc2e469016e2bd",
sha256 = "e6a6c016b0663e06fa5fccf1cd8152eab8aa8180c583ec20c872f4f9953a7ac5",
)

if not native.existing_rule("bazel_gazelle"):
Expand All @@ -73,3 +73,31 @@ def repositories():
],
sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10",
)

if not native.existing_rule("rules_proto"):
http_archive(
name = "rules_proto",
sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
strip_prefix = "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
],
)

if not native.existing_rule("com_github_bazelbuild_buildtools"):
http_archive(
name = "com_github_bazelbuild_buildtools",
sha256 = "86f62b307c9b4f6f4df7c4b3b583a617f10d32a13af3f8d8c311e4f87010410e",
strip_prefix = "buildtools-1.0.0",
urls = [
"https://github.com/bazelbuild/buildtools/archive/1.0.0.tar.gz",
],
)

if not native.existing_rule("bazel_build_rules_nodejs"):
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"],
)
Loading

0 comments on commit f08c9e0

Please sign in to comment.