remove windows compatibility for webhook, gateway, ratelimiter

diff --git a/.github/workflows/bazel-build.yml b/.github/workflows/bazel-build.yml
index 91fa6911d038188f36e0f754d76b59587e8fc96c..4de91e42180a08459dc69989235ff66bb33a4028 100644 (file)
--- a/.github/workflows/bazel-build.yml
+++ b/.github/workflows/bazel-build.yml
@@ -46,4 +46,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: all-${{ matrix.os }}
-          path: bazel-bin*/**/*
+          path: bazel-bin/package*

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index c6a697b..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "third_party/libsodium"]
-       path = third_party/libsodium
-       url = https://github.com/jedisct1/libsodium.git

diff --git a/BUILD b/BUILD
index 3f22c88814813cd7dfce799c83feaa819f184a1b..93b5e964900d8082202eb466d1aae4d80eb4f9d9 100644 (file)
--- a/BUILD
+++ b/BUILD
@@ -1,16 +1,38 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("@rules_pkg//:pkg.bzl", "pkg_zip", "pkg_tar")
 
 # gazelle:prefix github.com/discordnova/nova
 gazelle(name = "gazelle")
 
+filegroup(
+    name = "package_bin",
+    srcs = [
+        "//novactl",
+    ] + select({
+        "@bazel_tools//src/conditions:windows": [],
+        "//conditions:default": ["//webhook", "//gateway", "//ratelimiter"],
+    }),
+)
+
 pkg_tar(
-    name = "package",
+    name = "package_tar",
     extension = "tar.gz",
-    deps = [
-        "//gateway:gateway_pkg",
-        "//novactl:novactl_pkg",
-        "//ratelimiter:ratelimiter_pkg",
-        "//webhook:webhook_pkg",
+    srcs = [
+        ":package_bin"
     ],
 )
+
+pkg_zip(
+    name = "package_zip",
+    srcs = [
+        ":package_bin"
+    ],
+)
+
+filegroup(
+    name = "package",
+    srcs = [
+        ":package_zip",
+        ":package_tar",
+    ],
+)
\ No newline at end of file

diff --git a/WORKSPACE b/WORKSPACE
index 53b217fac8f8256e3496972a103f1b00ef69c224..14eb9dc25c6ac93a0912d3f3b92b4732ea76696a 100644 (file)
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -42,6 +42,15 @@ http_archive(
     ],
 )
 
+http_archive(
+    name = "rules_pkg",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
+    ],
+    sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d",
+)
+
 # golang configuration
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
@@ -92,9 +101,10 @@ crate_universe(
         ),
         "libsodium-sys": crate.override(
             extra_build_script_env_vars = {
-                "NUM_JOBS": "2"
+                "NUM_JOBS": "2",
+                "PATH": "/usr/sbin:/usr/bin:/sbin:/bin"
             }
-        ),
+        )
     },
     resolver_download_url_template = DEFAULT_URL_TEMPLATE,
     resolver_sha256s = DEFAULT_SHA256_CHECKSUMS,
@@ -103,3 +113,6 @@ crate_universe(
 load("@crates//:defs.bzl", "pinned_rust_install")
 
 pinned_rust_install()
+
+load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+rules_pkg_dependencies()
\ No newline at end of file

diff --git a/gateway/BUILD.bazel b/gateway/BUILD.bazel
index 50d5b5deb8f2dd368732b22cc01fd70925b6f85a..97af3b07cb58787266a1a97da97b8f27cc60e5c5 100644 (file)
--- a/gateway/BUILD.bazel
+++ b/gateway/BUILD.bazel
@@ -1,5 +1,4 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
 go_library(
     name = "gateway_lib",
@@ -19,11 +18,4 @@ go_binary(
     name = "gateway",
     embed = [":gateway_lib"],
     visibility = ["//visibility:public"],
-)
-
-pkg_tar(
-    name = "gateway_pkg",
-    srcs = [":gateway"],
-    mode = "0755",
-    visibility = ["//visibility:public"],
-)
+)
\ No newline at end of file

diff --git a/novactl/BUILD.bazel b/novactl/BUILD.bazel
index 3e31e23a34852891103e0cdc3ec54f6d15ba66e3..774f6fde80bc02b87d9982d7fa24f3b9d4620b59 100644 (file)
--- a/novactl/BUILD.bazel
+++ b/novactl/BUILD.bazel
@@ -1,5 +1,4 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
 go_library(
     name = "novactl_lib",
@@ -17,10 +16,3 @@ go_binary(
     embed = [":novactl_lib"],
     visibility = ["//visibility:public"],
 )
-
-pkg_tar(
-    name = "novactl_pkg",
-    srcs = [":novactl"],
-    mode = "0755",
-    visibility = ["//visibility:public"],
-)

diff --git a/ratelimiter/BUILD b/ratelimiter/BUILD
index 85cfc968ccfa8b25000eedc75399d77f6a3d914f..dc6335690c6f3fd049a34bc35490d3ba6693b1bf 100644 (file)
--- a/ratelimiter/BUILD
+++ b/ratelimiter/BUILD
@@ -1,7 +1,6 @@
 load("@rules_rust//rust:rust.bzl", "rust_binary")
 load("@rules_rust//cargo:cargo_build_script.bzl", "cargo_build_script")
 load("@crates//:defs.bzl", "build_crates_from", "crates_from")
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
 exports_files(["Cargo.toml"])
 
@@ -26,11 +25,5 @@ rust_binary(
     srcs = ["src/main.rs"],
     rustc_env = {},
     deps = crates_from("Cargo.toml") + [":build_script"],
-)
-
-pkg_tar(
-    name = "ratelimiter_pkg",
-    srcs = [":ratelimiter"],
-    mode = "0755",
     visibility = ["//visibility:public"],
 )

diff --git a/third_party/BUILD b/third_party/BUILD
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/webhook/BUILD b/webhook/BUILD
index db7a559f4e580d8e0f3fbc4862c027fc23a0c7c7..09489c5ec2c1cd0ec902291bcb683023e660a8e4 100644 (file)
--- a/webhook/BUILD
+++ b/webhook/BUILD
@@ -1,6 +1,5 @@
 load("@rules_rust//rust:rust.bzl", "rust_binary", "rust_library", "rust_test")
 load("@crates//:defs.bzl", "crates_from")
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 
 exports_files(["Cargo.toml"])
 
@@ -8,6 +7,7 @@ rust_binary(
     name = "webhook",
     srcs = glob(["src/**"]),
     deps = crates_from("Cargo.toml"),
+    visibility = ["//visibility:public"],
 )
 
 rust_test(
@@ -15,10 +15,3 @@ rust_test(
     crate = ":webhook",
     deps = crates_from("Cargo.toml"),
 )
-
-pkg_tar(
-    name = "webhook_pkg",
-    srcs = [":webhook"],
-    mode = "0755",
-    visibility = ["//visibility:public"],
-)