Skip to content

Commit

Permalink
Update rules_go, repo-infra, and rules_docker dependencies
Browse files Browse the repository at this point in the history
This requires bazel 0.6.0+.
  • Loading branch information
ixdy committed Oct 16, 2017
1 parent 02f0d92 commit 638ea52
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
28 changes: 17 additions & 11 deletions build/root/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
http_archive(
name = "io_bazel_rules_go",
sha256 = "27a13726ff8621cfa4592fbef116b253043c2b093c8814265dc4489a0e67d229",
strip_prefix = "rules_go-82483596ec203eb9c1849937636f4cbed83733eb",
urls = ["https://github.com/bazelbuild/rules_go/archive/82483596ec203eb9c1849937636f4cbed83733eb.tar.gz"],
sha256 = "a4ea00b71a6fc3bd381cbbf6eb83ec91fe8b32b1c622c048f1e6f0d965bb1a2d",
strip_prefix = "rules_go-a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058",
urls = ["https://github.com/bazelbuild/rules_go/archive/a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058.tar.gz"],
)

http_archive(
name = "io_kubernetes_build",
sha256 = "ca8fa1ee0928220d77fcaa6bcf40a26c57800c024e21b08c8dd9cc8fbf910236",
strip_prefix = "repo-infra-0aafaab9e158d3628804242c6a9c4dd3eb8bce1f",
urls = ["https://github.com/kubernetes/repo-infra/archive/0aafaab9e158d3628804242c6a9c4dd3eb8bce1f.tar.gz"],
sha256 = "8e49ac066fbaadd475bd63762caa90f81cd1880eba4cc25faa93355ef5fa2739",
strip_prefix = "repo-infra-e26fc85d14a1d3dc25569831acc06919673c545a",
urls = ["https://github.com/kubernetes/repo-infra/archive/e26fc85d14a1d3dc25569831acc06919673c545a.tar.gz"],
)

ETCD_VERSION = "3.1.10"
Expand All @@ -34,15 +34,21 @@ http_archive(

http_archive(
name = "io_bazel_rules_docker",
sha256 = "e86b8764fccc62dddf6e08382ba692b16479a2af478080b1ece4d9add8abbb9a",
strip_prefix = "rules_docker-28d492bc1dc1275e2c6ff74e51adc864e59ddc76",
urls = ["https://github.com/bazelbuild/rules_docker/archive/28d492bc1dc1275e2c6ff74e51adc864e59ddc76.tar.gz"],
sha256 = "c440717ee9b1b2f4a1e9bf5622539feb5aef9db83fc1fa1517818f13c041b0be",
strip_prefix = "rules_docker-8bbe2a8abd382641e65ff7127a3700a8530f02ce",
urls = ["https://github.com/bazelbuild/rules_docker/archive/8bbe2a8abd382641e65ff7127a3700a8530f02ce.tar.gz"],
)

load("@io_bazel_rules_go//go:def.bzl", "go_repositories")
load("@io_kubernetes_build//defs:bazel_version.bzl", "check_version")

check_version("0.6.0")

load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories", "docker_pull")

go_repositories(
go_rules_dependencies()

go_register_toolchains(
go_version = "1.8.3",
)

Expand Down
4 changes: 2 additions & 2 deletions hack/update-bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"
# The git commit sha1s here should match the values in $KUBE_ROOT/WORKSPACE.
kube::util::go_install_from_commit \
github.com/kubernetes/repo-infra/kazel \
4eaf9e671bbb549fb4ec292cf251f921d7ef80ac
e26fc85d14a1d3dc25569831acc06919673c545a
kube::util::go_install_from_commit \
github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle \
82483596ec203eb9c1849937636f4cbed83733eb
a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058

touch "${KUBE_ROOT}/vendor/BUILD"

Expand Down
8 changes: 6 additions & 2 deletions hack/verify-bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,12 @@ fi
rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"

# The git commit sha1s here should match the values in $KUBE_ROOT/WORKSPACE.
kube::util::go_install_from_commit github.com/kubernetes/repo-infra/kazel 4eaf9e671bbb549fb4ec292cf251f921d7ef80ac
kube::util::go_install_from_commit github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle 82483596ec203eb9c1849937636f4cbed83733eb
kube::util::go_install_from_commit \
github.com/kubernetes/repo-infra/kazel \
e26fc85d14a1d3dc25569831acc06919673c545a
kube::util::go_install_from_commit \
github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle \
a280fbac1a0a4c67b0eee660b4fd1b3db7c9f058

gazelle_diff=$(gazelle fix -build_file_name=BUILD,BUILD.bazel -external=vendored -mode=diff -repo_root="$(kube::realpath ${KUBE_ROOT})")
kazel_diff=$(kazel -dry-run -print-diff -root="$(kube::realpath ${KUBE_ROOT})")
Expand Down

0 comments on commit 638ea52

Please sign in to comment.