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/games/factorio/modproxy/BUILD.bazel b/games/factorio/modproxy/BUILD.bazel
index fb0c344..c0f5b9f 100644
--- a/games/factorio/modproxy/BUILD.bazel
+++ b/games/factorio/modproxy/BUILD.bazel
@@ -2,33 +2,33 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "modproxy_lib",
srcs = ["main.go"],
importpath = "code.hackerspace.pl/hscloud/games/factorio/modproxy",
visibility = ["//visibility:private"],
deps = [
- "//games/factorio/modproxy/modportal:go_default_library",
- "//games/factorio/modproxy/proto:go_default_library",
- "//go/mirko: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",
+ "//games/factorio/modproxy/modportal",
+ "//games/factorio/modproxy/proto",
+ "//go/mirko",
+ "@com_github_golang_glog//:glog",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
],
)
go_binary(
name = "modproxy",
- embed = [":go_default_library"],
+ embed = [":modproxy_lib"],
visibility = ["//visibility:public"],
)
container_layer(
name = "layer_bin",
+ directory = "/games/factorio/modproxy/",
files = [
":modproxy",
- "//games/factorio/modproxy/client:client",
+ "//games/factorio/modproxy/client",
],
- directory = "/games/factorio/modproxy/",
)
container_image(
@@ -41,8 +41,8 @@
container_push(
name = "push",
- image = ":runtime",
format = "Docker",
+ image = ":runtime",
registry = "registry.k0.hswaw.net",
repository = "games/factorio/modproxy",
tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/games/factorio/modproxy/client/BUILD.bazel b/games/factorio/modproxy/client/BUILD.bazel
index 66ee10f..e3b01e9 100644
--- a/games/factorio/modproxy/client/BUILD.bazel
+++ b/games/factorio/modproxy/client/BUILD.bazel
@@ -1,22 +1,22 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
- name = "go_default_library",
+ name = "client_lib",
srcs = ["client.go"],
importpath = "code.hackerspace.pl/hscloud/games/factorio/modproxy/client",
visibility = ["//visibility:private"],
deps = [
- "//games/factorio/modproxy/modportal:go_default_library",
- "//games/factorio/modproxy/proto:go_default_library",
- "//go/pki:go_default_library",
- "@com_github_gogo_protobuf//proto:go_default_library",
- "@com_github_golang_glog//:go_default_library",
+ "//games/factorio/modproxy/modportal",
+ "//games/factorio/modproxy/proto",
+ "//go/pki",
+ "@com_github_gogo_protobuf//proto",
+ "@com_github_golang_glog//:glog",
"@org_golang_google_grpc//:go_default_library",
],
)
go_binary(
name = "client",
- embed = [":go_default_library"],
+ embed = [":client_lib"],
visibility = ["//visibility:public"],
)
diff --git a/games/factorio/modproxy/modportal/BUILD.bazel b/games/factorio/modproxy/modportal/BUILD.bazel
index 051aec7..74cd8f9 100644
--- a/games/factorio/modproxy/modportal/BUILD.bazel
+++ b/games/factorio/modproxy/modportal/BUILD.bazel
@@ -1,12 +1,12 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "modportal",
srcs = ["modportal.go"],
importpath = "code.hackerspace.pl/hscloud/games/factorio/modproxy/modportal",
visibility = ["//visibility:public"],
deps = [
- "@org_golang_google_grpc//codes:go_default_library",
- "@org_golang_google_grpc//status:go_default_library",
+ "@org_golang_google_grpc//codes",
+ "@org_golang_google_grpc//status",
],
)
diff --git a/games/factorio/modproxy/proto/BUILD.bazel b/games/factorio/modproxy/proto/BUILD.bazel
index 0c30b2c..b8a1ee2 100644
--- a/games/factorio/modproxy/proto/BUILD.bazel
+++ b/games/factorio/modproxy/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/games/factorio/modproxy/proto",
visibility = ["//visibility:public"],