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/hswaw/oodviewer/BUILD.bazel b/hswaw/oodviewer/BUILD.bazel
index 607780d..769051c 100644
--- a/hswaw/oodviewer/BUILD.bazel
+++ b/hswaw/oodviewer/BUILD.bazel
@@ -2,7 +2,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "oodviewer_lib",
srcs = [
"app.go",
"main.go",
@@ -11,24 +11,24 @@
importpath = "code.hackerspace.pl/hscloud/hswaw/oodviewer",
visibility = ["//visibility:private"],
deps = [
- "//hswaw/oodviewer/templates:go_default_library",
- "@com_github_golang_glog//:go_default_library",
- "@com_github_lib_pq//:go_default_library",
+ "//hswaw/oodviewer/templates",
+ "@com_github_golang_glog//:glog",
+ "@com_github_lib_pq//:pq",
],
)
go_binary(
name = "oodviewer",
- embed = [":go_default_library"],
+ embed = [":oodviewer_lib"],
visibility = ["//visibility:public"],
)
container_layer(
name = "layer_bin",
+ directory = "/hswaw/",
files = [
":oodviewer",
],
- directory = "/hswaw/",
)
container_image(
@@ -41,8 +41,8 @@
container_push(
name = "push",
- image = ":runtime",
format = "Docker",
+ image = ":runtime",
registry = "registry.k0.hswaw.net",
repository = "q3k/oodviewer",
tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/hswaw/oodviewer/templates/BUILD.bazel b/hswaw/oodviewer/templates/BUILD.bazel
index be98820..f902c0e 100644
--- a/hswaw/oodviewer/templates/BUILD.bazel
+++ b/hswaw/oodviewer/templates/BUILD.bazel
@@ -4,17 +4,17 @@
go_embed_data(
name = "templates_data",
srcs = glob(["*.html"]),
- package = "templates",
flatten = True,
+ package = "templates",
)
go_library(
- name = "go_default_library",
+ name = "templates",
srcs = [
":templates_data", # keep
],
+ importpath = "code.hackerspace.pl/hscloud/hswaw/oodviewer/templates", # keep
visibility = [
"//hswaw/oodviewer:__pkg__",
],
- importpath = "code.hackerspace.pl/hscloud/hswaw/oodviewer/templates",
)