diff --git a/.bazelrc b/.bazelrc index be4c6dc3e..09aacd2e3 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,53 +1,53 @@ build --stamp --workspace_status_command=./pkg/version/ldflags_bazel run --stamp --workspace_status_command=./pkg/version/ldflags_bazel -# https://github.com/bazelbuild/rules_go/issues/1642 -build:go_win32 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_win32 --host_platform=@local_config_platform//:host -build:go_win32 --crosstool_top=//toolchain:mingw_suite -build:go_win32 --cpu=x86_32 -build:go_win32 --compiler=mingw -#build:go_win32 --platforms=:windows_386_cgo -build:go_win32 --platforms=@io_bazel_rules_go//go/toolchain:windows_386_cgo +# # https://github.com/bazelbuild/rules_go/issues/1642 +# build:go_win32 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_win32 --host_platform=@local_config_platform//:host +# build:go_win32 --crosstool_top=//toolchain:mingw_suite +# build:go_win32 --cpu=x86_32 +# build:go_win32 --compiler=mingw +# #build:go_win32 --platforms=:windows_386_cgo +# build:go_win32 --platforms=@io_bazel_rules_go//go/toolchain:windows_386_cgo -build:go_win64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_win64 --host_platform=@local_config_platform//:host -build:go_win64 --crosstool_top=//toolchain:mingw_suite -build:go_win64 --cpu=x86_64 -build:go_win64 --compiler=mingw64 -build:go_win64 --platforms=@io_bazel_rules_go//go/toolchain:windows_amd64_cgo +# build:go_win64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_win64 --host_platform=@local_config_platform//:host +# build:go_win64 --crosstool_top=//toolchain:mingw_suite +# build:go_win64 --cpu=x86_64 +# build:go_win64 --compiler=mingw64 +# build:go_win64 --platforms=@io_bazel_rules_go//go/toolchain:windows_amd64_cgo -build:go_android_386 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_android_386 --host_platform=@local_config_platform//:host -build:go_android_386 --crosstool_top=//toolchain:android_suite -build:go_android_386 --cpu=x86_32 -build:go_android_386 --compiler=android_386 -build:go_android_386 --platforms=@io_bazel_rules_go//go/toolchain:android_386_cgo -build:go_android_386 --action_env=ANDROID_NDK_HOME +# build:go_android_386 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_android_386 --host_platform=@local_config_platform//:host +# build:go_android_386 --crosstool_top=//toolchain:android_suite +# build:go_android_386 --cpu=x86_32 +# build:go_android_386 --compiler=android_386 +# build:go_android_386 --platforms=@io_bazel_rules_go//go/toolchain:android_386_cgo +# build:go_android_386 --action_env=ANDROID_NDK_HOME -build:go_android_amd64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_android_amd64 --host_platform=@local_config_platform//:host -build:go_android_amd64 --crosstool_top=//toolchain:android_suite -build:go_android_amd64 --cpu=x86_64 -build:go_android_amd64 --compiler=android_amd64 -build:go_android_amd64 --platforms=@io_bazel_rules_go//go/toolchain:android_amd64_cgo -build:go_android_amd64 --action_env=ANDROID_NDK_HOME +# build:go_android_amd64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_android_amd64 --host_platform=@local_config_platform//:host +# build:go_android_amd64 --crosstool_top=//toolchain:android_suite +# build:go_android_amd64 --cpu=x86_64 +# build:go_android_amd64 --compiler=android_amd64 +# build:go_android_amd64 --platforms=@io_bazel_rules_go//go/toolchain:android_amd64_cgo +# build:go_android_amd64 --action_env=ANDROID_NDK_HOME -build:go_android_arm64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_android_arm64 --host_platform=@local_config_platform//:host -build:go_android_arm64 --crosstool_top=//toolchain:android_suite -build:go_android_arm64 --cpu=aarch64 -build:go_android_arm64 --compiler=android_arm64 -build:go_android_arm64 --platforms=@io_bazel_rules_go//go/toolchain:android_arm64_cgo -build:go_android_arm64 --action_env=ANDROID_NDK_HOME +# build:go_android_arm64 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_android_arm64 --host_platform=@local_config_platform//:host +# build:go_android_arm64 --crosstool_top=//toolchain:android_suite +# build:go_android_arm64 --cpu=aarch64 +# build:go_android_arm64 --compiler=android_arm64 +# build:go_android_arm64 --platforms=@io_bazel_rules_go//go/toolchain:android_arm64_cgo +# build:go_android_arm64 --action_env=ANDROID_NDK_HOME -build:go_android_armv7 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:go_android_armv7 --host_platform=@local_config_platform//:host -build:go_android_armv7 --crosstool_top=//toolchain:android_suite -build:go_android_armv7 --cpu=armv7 -build:go_android_armv7 --compiler=android_armv7 -build:go_android_armv7 --platforms=@io_bazel_rules_go//go/toolchain:android_arm_cgo -build:go_android_armv7 --action_env=ANDROID_NDK_HOME +# build:go_android_armv7 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain +# build:go_android_armv7 --host_platform=@local_config_platform//:host +# build:go_android_armv7 --crosstool_top=//toolchain:android_suite +# build:go_android_armv7 --cpu=armv7 +# build:go_android_armv7 --compiler=android_armv7 +# build:go_android_armv7 --platforms=@io_bazel_rules_go//go/toolchain:android_arm_cgo +# build:go_android_armv7 --action_env=ANDROID_NDK_HOME # TODO: migrate all dependencies from WORKSPACE to MODULE.bazel # https://github.com/protocolbuffers/protobuf/issues/14313 diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index 19b860c18..000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -6.4.0 diff --git a/BUILD.bazel b/BUILD.bazel index e4734bc57..1f8e75e2b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -156,17 +156,17 @@ platform( clojure_repl(name = "clj_repl") -load("@com_github_google_rules_install//installer:def.bzl", "installer") +# load("@com_github_google_rules_install//installer:def.bzl", "installer") -installer( - name = "install_k0s", - data = [":k0s"], -) +# installer( +# name = "install_k0s", +# data = [":k0s"], +# ) -installer( - name = "install_k0s_static", - data = [":k0s_static"], -) +# installer( +# name = "install_k0s_static", +# data = [":k0s_static"], +# ) go_library( name = "go_default_library", diff --git a/Makefile b/Makefile index 28a04eacd..2f0f58915 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,8 @@ bazel-build-linux: ## Build linux binaries using bazel # $(BAZEL) build --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x //:k0s_static bazel-build: ## Build binary for current platform using bazel - $(BAZEL) run //:install_k0s_static -- -g $(PWD)/bin + $(BAZEL) build //:k0s_static + # $(BAZEL) run //:install_k0s_static -- -g $(PWD)/bin # $(BAZEL) build # //:k0s # //cmd/{hub,client,agent} build: ## Build binary for current platform diff --git a/WORKSPACE b/WORKSPACE index 2d277a72b..40bb13bca 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -18,15 +18,34 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") # path = ANDROID_NDK_HOME, # ) -register_toolchains( - "//toolchain:cc-toolchain-mingw", - "//toolchain:cc-toolchain-mingw64", - "//toolchain:cc-toolchain-android_amd64", - "//toolchain:cc-toolchain-android_386", - "//toolchain:cc-toolchain-android_arm64", - "//toolchain:cc-toolchain-android_armv7", +# register_toolchains( +# "//toolchain:cc-toolchain-mingw", +# "//toolchain:cc-toolchain-mingw64", +# "//toolchain:cc-toolchain-android_amd64", +# "//toolchain:cc-toolchain-android_386", +# "//toolchain:cc-toolchain-android_arm64", +# "//toolchain:cc-toolchain-android_armv7", +# ) + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +# git_repository( +# name = "rules_python", +# branch = "master", +# remote = "https://github.com/bazelbuild/rules_python.git", +# ) + +http_archive( + name = "rules_python", + sha256 = "d70cd72a7a4880f0000a6346253414825c19cdd40a28289bdf67b8e6480edff8", + strip_prefix = "rules_python-0.28.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.28.0/rules_python-0.28.0.tar.gz", ) +load("@rules_python//python:repositories.bzl", "py_repositories") + +py_repositories() + git_repository( name = "io_bazel_rules_go", # commit = "b8fd0bb7a7c384eca8c9c179754cbf6644e67feb", @@ -105,43 +124,43 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") # go_repos -local_repository( - name = "starlark", - path = "starlark", -) +# local_repository( +# name = "starlark", +# path = "starlark", +# ) -load("@starlark//:defs.bzl", "print_seq") +# load("@starlark//:defs.bzl", "print_seq") -print_seq() +# print_seq() -# https://github.com/google/bazel_rules_install -git_repository( - name = "com_github_google_rules_install", - branch = "main", - # commit = "e93a17ed42a8a622a78fbf4737309e583f4b3cb4", - remote = "https://github.com/google/bazel_rules_install.git", -) +# # https://github.com/google/bazel_rules_install +# git_repository( +# name = "com_github_google_rules_install", +# branch = "main", +# # commit = "e93a17ed42a8a622a78fbf4737309e583f4b3cb4", +# remote = "https://github.com/google/bazel_rules_install.git", +# ) -load("@com_github_google_rules_install//:deps.bzl", "install_rules_dependencies") +# load("@com_github_google_rules_install//:deps.bzl", "install_rules_dependencies") -install_rules_dependencies() +# install_rules_dependencies() -load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") +# load("@com_github_google_rules_install//:setup.bzl", "install_rules_setup") -install_rules_setup() +# install_rules_setup() # install bbox -git_repository( - name = "bbox", - # commit = "16d0642dda469579fecf2d2e1efff544e30a60c1", - branch = "master", - remote = "https://github.com/btwiuse/bbox.git", -) - -load("@bbox//:package.bzl", "register_repositories") - -register_repositories() - +# git_repository( +# name = "bbox", +# # commit = "16d0642dda469579fecf2d2e1efff544e30a60c1", +# branch = "master", +# remote = "https://github.com/btwiuse/bbox.git", +# ) +# +# load("@bbox//:package.bzl", "register_repositories") +# +# register_repositories() +# load("//:go_repos.bzl", "go_repositories") go_repositories() @@ -212,14 +231,6 @@ container_pull( tag = "latest", ) -git_repository( - name = "rules_python", - branch = "master", - remote = "https://github.com/bazelbuild/rules_python.git", -) - -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") - git_repository( name = "io_bazel_rules_grafana", # commit = "{HEAD}", # replace with a real commit hash