summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-11-09 09:47:04 +0100
committermergify-bot <noreply@mergify.io>2021-11-09 12:15:52 +0000
commit7b0770c2a274a72bdb90bd99dda8a86bf147e1e9 (patch)
treed7c38fbd7faee95c6fc6582ac13f6951492b14b1
parenta559ab3f9a5dbf9afed575bb04b0a084a98345ba (diff)
downloadrabbitmq-server-git-7b0770c2a274a72bdb90bd99dda8a86bf147e1e9.tar.gz
Update to osiris 1.2.3 in bazel build
-rw-r--r--BUILD.osiris24
-rw-r--r--workspace_helpers.bzl15
2 files changed, 8 insertions, 31 deletions
diff --git a/BUILD.osiris b/BUILD.osiris
deleted file mode 100644
index 1dec899cb6..0000000000
--- a/BUILD.osiris
+++ /dev/null
@@ -1,24 +0,0 @@
-load("@bazel-erlang//:bazel_erlang_lib.bzl", "erlang_lib")
-
-APP_ENV = """[
- {data_dir, "/tmp/osiris"},
- {port_range, {6000, 6500}},
- {max_segment_size_chunks, 256000}
-]"""
-
-DEPS = [
- "@gen_batch_server//:bazel_erlang_lib",
-]
-
-erlang_lib(
- app_name = "osiris",
- app_version = "1.0.0",
- app_description = "New project",
- app_module = "osiris_app",
- app_env = APP_ENV,
- extra_apps = [
- "sasl",
- "crypto",
- ],
- deps = DEPS,
-)
diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl
index 8003cf1b51..ee521a0d89 100644
--- a/workspace_helpers.bzl
+++ b/workspace_helpers.bzl
@@ -1,5 +1,9 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load(
+ "@bazel_tools//tools/build_defs/repo:git.bzl",
+ "git_repository",
+ "new_git_repository",
+)
load("@bazel-erlang//:github.bzl", "github_bazel_erlang_lib")
load("@bazel-erlang//:hex_archive.bzl", "hex_archive")
load("@bazel-erlang//:hex_pm.bzl", "hex_pm_bazel_erlang_lib")
@@ -168,13 +172,10 @@ erlang_lib(
sha256 = "4ccafaaa2ce01b85ddd14591f4d5f6731b4e13b610a70fb841f0701178478280",
)
- github_bazel_erlang_lib(
+ git_repository(
name = "osiris",
- org = "rabbitmq",
- ref = "v1.0.0",
- version = "1.0.0",
- build_file = rabbitmq_workspace + "//:BUILD.osiris",
- sha256 = "7b30a02eeca7a89ba34dadf8d54eaa4e3f0c5dd19fab4bb84f8150f9f42b03a0",
+ tag = "v1.2.3",
+ remote = "https://github.com/rabbitmq/osiris.git",
)
hex_pm_bazel_erlang_lib(