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/smsgw/BUILD.bazel b/hswaw/smsgw/BUILD.bazel
index 0e91141..000f20c 100644
--- a/hswaw/smsgw/BUILD.bazel
+++ b/hswaw/smsgw/BUILD.bazel
@@ -2,7 +2,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "smsgw_lib",
srcs = [
"dispatcher.go",
"main.go",
@@ -11,32 +11,32 @@
importpath = "code.hackerspace.pl/hscloud/hswaw/smsgw",
visibility = ["//visibility:private"],
deps = [
- "//go/mirko:go_default_library",
- "//hswaw/smsgw/proto:go_default_library",
- "@com_github_golang_glog//:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
+ "//go/mirko",
+ "//hswaw/smsgw/proto",
+ "@com_github_golang_glog//:glog",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
],
)
go_binary(
name = "smsgw",
- embed = [":go_default_library"],
+ embed = [":smsgw_lib"],
visibility = ["//visibility:public"],
)
go_test(
- name = "go_default_test",
+ name = "smsgw_test",
srcs = ["dispatcher_test.go"],
- embed = [":go_default_library"],
+ embed = [":smsgw_lib"],
)
container_layer(
name = "layer_bin",
+ directory = "/smsgw/",
files = [
":smsgw",
],
- directory = "/smsgw/",
)
container_image(
@@ -49,8 +49,8 @@
container_push(
name = "push",
- image = ":runtime",
format = "Docker",
+ image = ":runtime",
registry = "registry.k0.hswaw.net",
repository = "q3k/smsgs",
tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/hswaw/smsgw/proto/BUILD.bazel b/hswaw/smsgw/proto/BUILD.bazel
index be3451f..0aca681 100644
--- a/hswaw/smsgw/proto/BUILD.bazel
+++ b/hswaw/smsgw/proto/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -16,7 +17,7 @@
)
go_library(
- name = "go_default_library",
+ name = "proto",
embed = [":proto_go_proto"],
importpath = "code.hackerspace.pl/hscloud/hswaw/smsgw/proto",
visibility = ["//visibility:public"],