From e231d4280ba82ca16317a3adb019c1b48db1263f Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Tue, 2 May 2017 15:19:56 -0700 Subject: [PATCH] Replace git_repository with http_archive and use ixdy's fork of bazel tools for pkg_tar --- WORKSPACE | 31 +++++++++++++++++++------------ build/debs/BUILD | 2 +- build/release-tars/BUILD | 2 +- cluster/BUILD | 2 +- cluster/addons/BUILD | 2 +- cluster/gce/BUILD | 2 +- cluster/saltbase/BUILD | 2 +- federation/BUILD | 2 +- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0405f03316511..92a81c530f5a5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,25 +1,32 @@ -git_repository( +http_archive( name = "io_bazel_rules_go", - commit = "805fd1566500997379806373feb05e138a4dfe28", - remote = "https://github.com/bazelbuild/rules_go.git", + sha256 = "a1cae429e9d591017421150e3173478c46c693bc594322c7fa7e6cb5f672ef59", + strip_prefix = "rules_go-805fd1566500997379806373feb05e138a4dfe28", + urls = ["https://github.com/bazelbuild/rules_go/archive/805fd1566500997379806373feb05e138a4dfe28.tar.gz"], ) -git_repository( +http_archive( name = "io_kubernetes_build", - commit = "684e550a2f006dbe3cf3b3d481d3f19217b228f7", - remote = "https://github.com/kubernetes/repo-infra.git", + sha256 = "1d146ccc034d3a9d8f5f02237144b78be135a0fb06935b37c745a2e7fcfecfed", + strip_prefix = "repo-infra-684e550a2f006dbe3cf3b3d481d3f19217b228f7", + urls = ["https://github.com/kubernetes/repo-infra/archive/684e550a2f006dbe3cf3b3d481d3f19217b228f7.tar.gz"], ) -git_repository( +# This contains a patch to not prepend ./ to tarfiles produced by pkg_tar. +# When merged upstream, we'll no longer need to use ixdy's fork: +# https://bazel-review.googlesource.com/#/c/10390/ +http_archive( name = "io_bazel", - commit = "b571b72961b9244059bdf96818948623cebf342e", - remote = "https://github.com/ixdy/bazel.git", + sha256 = "667d32da016b1e2f63cf345cd3583989ec4a165034df383a01996d93635753a0", + strip_prefix = "bazel-df2c687c22bdd7c76f3cdcc85f38fefd02f0b844", + urls = ["https://github.com/ixdy/bazel/archive/df2c687c22bdd7c76f3cdcc85f38fefd02f0b844.tar.gz"], ) -git_repository( +http_archive( name = "io_bazel_rules_docker", - commit = "52d9faf209ff6d16eb850b6b66d03483735e0633", - remote = "https://github.com/bazelbuild/rules_docker.git", + sha256 = "261fbd8fda1d06a12a0479019b46acd302c6aaa8df8e49383dc37917f20492a1", + strip_prefix = "rules_docker-52d9faf209ff6d16eb850b6b66d03483735e0633", + urls = ["https://github.com/bazelbuild/rules_docker/archive/52d9faf209ff6d16eb850b6b66d03483735e0633.tar.gz"], ) load("@io_bazel_rules_go//go:def.bzl", "go_repositories") diff --git a/build/debs/BUILD b/build/debs/BUILD index 18c7a1c960ba1..0f3ffb46bf859 100644 --- a/build/debs/BUILD +++ b/build/debs/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar", "pkg_deb") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar", "pkg_deb") load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD index a984a5b9dba8e..0d09ffcccfe07 100644 --- a/build/release-tars/BUILD +++ b/build/release-tars/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") filegroup( diff --git a/cluster/BUILD b/cluster/BUILD index 58250110ef2c5..33277e4b5f42f 100644 --- a/cluster/BUILD +++ b/cluster/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") licenses(["notice"]) diff --git a/cluster/addons/BUILD b/cluster/addons/BUILD index cb6b276b11e54..c3e5620e25b8c 100644 --- a/cluster/addons/BUILD +++ b/cluster/addons/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") filegroup( name = "addon-srcs", diff --git a/cluster/gce/BUILD b/cluster/gce/BUILD index e063b87d934cf..ccc7be8ae25f3 100644 --- a/cluster/gce/BUILD +++ b/cluster/gce/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") pkg_tar( diff --git a/cluster/saltbase/BUILD b/cluster/saltbase/BUILD index 4de5819e2bb9d..13723fb63e33c 100644 --- a/cluster/saltbase/BUILD +++ b/cluster/saltbase/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") filegroup( name = "package-srcs", diff --git a/federation/BUILD b/federation/BUILD index a8c446f36444e..b529dba87735a 100644 --- a/federation/BUILD +++ b/federation/BUILD @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") +load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar") filegroup( name = "package-srcs",