Merge pull request #4485 from munnerz/m1-support

Add support for building all Bazel targets on M1 macs
This commit is contained in:
jetstack-bot 2021-10-01 14:03:35 +01:00 committed by GitHub
commit f41310a82d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions

View File

@ -46,7 +46,7 @@ CLIENT_PLATFORMS = {
TEST_PLATFORMS = {
"linux": ["amd64"],
"darwin": ["amd64"],
"darwin": ["amd64", "arm64"],
}
# Helper which produces the ALL_PLATFORMS dictionary, currently composed of

View File

@ -18,6 +18,7 @@ genrule(
name = "com_coreos_etcd",
srcs = select({
":darwin": ["@kubebuilder-tools_darwin_amd64//:etcd"],
":darwin_arm": ["@kubebuilder-tools_darwin_amd64//:etcd"],
":k8": ["@kubebuilder-tools_linux_amd64//:etcd"],
}),
outs = ["etcd"],
@ -29,6 +30,7 @@ genrule(
name = "co_honnef_go_tools_staticcheck",
srcs = select({
":darwin": ["@co_honnef_go_tools_staticcheck_osx//:file"],
":darwin_arm": ["@co_honnef_go_tools_staticcheck_osx//:file"],
":k8": ["@co_honnef_go_tools_staticcheck_linux//:file"],
}),
outs = ["staticcheck"],
@ -40,6 +42,7 @@ genrule(
name = "io_kubernetes_kube-apiserver",
srcs = select({
":darwin": ["@kubebuilder-tools_darwin_amd64//:kube-apiserver"],
":darwin_arm": ["@kubebuilder-tools_darwin_amd64//:kube-apiserver"],
":k8": ["@kubebuilder-tools_linux_amd64//:kube-apiserver"],
}),
outs = ["kube-apiserver"],
@ -64,6 +67,8 @@ genrule(
name = "fetch_oc3",
srcs = select({
":k8": ["@oc_3_11_linux//:file"],
":darwin": ["@oc_3_11_mac//:file"],
":darwin_arm": ["@oc_3_11_mac//:file"],
}),
outs = ["oc3"],
cmd = "cp $(SRCS) $@",

View File

@ -54,7 +54,7 @@ filegroup(
http_archive(
name = "co_honnef_go_tools_staticcheck_osx",
sha256 = "03b100561e3bc14db0b3b4004b102a00cb0197938d23cc40193f269f7b246d2d",
sha256 = "7fb41768b8e68aaad397f666d7d5eb9c31abcc4180b5cb6fa7d091cef987eb77",
urls = ["https://github.com/dominikh/go-tools/releases/download/2021.1/staticcheck_darwin_amd64.tar.gz"],
build_file_content = """
filegroup(
@ -206,6 +206,21 @@ filegroup(
"openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/oc",
],
visibility = ["//visibility:public"],
)
""",
)
http_archive(
name = "oc_3_11_mac",
sha256 = "75d58500aec1a2cee9473dfa826c81199669dbc0f49806e31a13626b5e4cfcf0",
urls = ["https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-mac.zip"],
build_file_content =
"""
filegroup(
name = "file",
srcs = [
"oc",
],
visibility = ["//visibility:public"],
)
""",
)