diff options
| -rw-r--r-- | .github/workflows/bazel-build.yml | 2 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | BUILD | 36 | ||||
| -rw-r--r-- | WORKSPACE | 17 | ||||
| -rw-r--r-- | gateway/BUILD.bazel | 10 | ||||
| -rw-r--r-- | novactl/BUILD.bazel | 8 | ||||
| -rw-r--r-- | ratelimiter/BUILD | 7 | ||||
| -rw-r--r-- | third_party/BUILD | 0 | ||||
| -rw-r--r-- | webhook/BUILD | 9 |
9 files changed, 47 insertions, 45 deletions
diff --git a/.github/workflows/bazel-build.yml b/.github/workflows/bazel-build.yml index 91fa691..4de91e4 100644 --- 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 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 @@ -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 @@ -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 50d5b5d..97af3b0 100644 --- 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 3e31e23..774f6fd 100644 --- 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 85cfc96..dc63356 100644 --- 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 index 0000000..e69de29 --- /dev/null +++ b/third_party/BUILD diff --git a/webhook/BUILD b/webhook/BUILD index db7a559..09489c5 100644 --- 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"], -) |