go: re-do the entire thing
This is a mega-change, but attempting to split this up further is
probably not worth the effort.
Summary:
1. Bump up bazel, rules_go, and others.
2. Switch to new go target naming (bye bye go_default_library)
3. Move go deps to go.mod/go.sum, use make gazelle generate from that
4. Bump up Python deps a bit
And also whatever was required to actually get things to work - loads of
small useless changes.
Tested to work on NixOS and Ubuntu 20.04:
$ bazel build //...
$ bazel test //...
Change-Id: I8364bdaa1406b9ae4d0385a6b607f3e7989f98a9
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1583
Reviewed-by: q3k <q3k@hackerspace.pl>
diff --git a/tools/BUILD b/tools/BUILD
index 3cc6d3e..2a5c686 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -20,20 +20,20 @@
py_binary(
name = "secretstore",
- python_version = "PY3",
srcs = ["secretstore.py"],
+ python_version = "PY3",
visibility = ["//visibility:public"],
)
py_binary(
name = "pass",
- python_version = "PY3",
srcs = ["pass.py"],
+ python_version = "PY3",
visibility = ["//visibility:public"],
)
copy_go_binary(
name = "prodaccess",
- src = "//cluster/prodaccess:prodaccess",
+ src = "//cluster/prodaccess",
visibility = ["//visibility:public"],
)
diff --git a/tools/gostatic/BUILD b/tools/gostatic/BUILD
index 13a250d..9ea52c7 100644
--- a/tools/gostatic/BUILD
+++ b/tools/gostatic/BUILD
@@ -5,4 +5,3 @@
src = "@com_github_piranha_gostatic//:gostatic",
visibility = ["//visibility:public"],
)
-
diff --git a/tools/gostatic/example/BUILD b/tools/gostatic/example/BUILD
index cb54fec..bd41b18 100644
--- a/tools/gostatic/example/BUILD
+++ b/tools/gostatic/example/BUILD
@@ -2,10 +2,12 @@
gostatic_tarball(
name = "example",
- templates = [
- "site.tmpl",
+ srcs = [
+ "src/blog.atom",
+ "src/blog/first.md",
+ "src/index.html",
+ "src/static/style.css",
],
- source_dir = "src",
extra_config = """
TITLE = Example Site
URL = https://example.com
@@ -36,10 +38,8 @@
template page
""",
- srcs = [
- "src/blog/first.md",
- "src/static/style.css",
- "src/blog.atom",
- "src/index.html",
+ source_dir = "src",
+ templates = [
+ "site.tmpl",
],
)
diff --git a/tools/gostatic/gomod-import-force.go b/tools/gostatic/gomod-import-force.go
new file mode 100644
index 0000000..b37a366
--- /dev/null
+++ b/tools/gostatic/gomod-import-force.go
@@ -0,0 +1,8 @@
+//go:build tools
+// +build tools
+
+package gostatic
+
+import (
+ _ "github.com/piranha/gostatic"
+)
diff --git a/tools/gostatic/tarify/BUILD.bazel b/tools/gostatic/tarify/BUILD.bazel
index 7bc841b..9a6dab5 100644
--- a/tools/gostatic/tarify/BUILD.bazel
+++ b/tools/gostatic/tarify/BUILD.bazel
@@ -1,15 +1,15 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "tarify_lib",
srcs = ["main.go"],
importpath = "code.hackerspace.pl/hscloud/tools/gostatic/tarify",
visibility = ["//visibility:private"],
- deps = ["@com_github_golang_glog//:go_default_library"],
+ deps = ["@com_github_golang_glog//:glog"],
)
go_binary(
name = "tarify",
- embed = [":go_default_library"],
+ embed = [":tarify_lib"],
visibility = ["//visibility:public"],
)
diff --git a/tools/hscloud/BUILD.bazel b/tools/hscloud/BUILD.bazel
index ac455b3..766ad21 100644
--- a/tools/hscloud/BUILD.bazel
+++ b/tools/hscloud/BUILD.bazel
@@ -6,8 +6,8 @@
importpath = "code.hackerspace.pl/hscloud/tools/hscloud",
visibility = ["//visibility:private"],
deps = [
- "//go/workspace:go_default_library",
- "@com_github_spf13_cobra//:go_default_library",
+ "//go/workspace",
+ "@com_github_spf13_cobra//:cobra",
],
)
@@ -22,13 +22,13 @@
srcs = [
"lib.sh",
],
- deps = [
- "@bazel_tools//tools/bash/runfiles",
- ],
data = [
":hscloud",
],
visibility = ["//visibility:public"],
+ deps = [
+ "@bazel_tools//tools/bash/runfiles",
+ ],
)
py_library(
@@ -36,11 +36,11 @@
srcs = [
"lib.py",
],
- deps = [
- "@rules_python//python/runfiles",
- ],
data = [
":hscloud",
],
visibility = ["//visibility:public"],
+ deps = [
+ "@rules_python//python/runfiles",
+ ],
)