Skip to content

Commit

Permalink
Merge branch 'master' into shovel-obfuscatepassword
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Sep 21, 2021
2 parents 1c09040 + 0d54e71 commit 59c4327
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-mixed-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '*.bzl'
- '*.bazel'
- .github/workflows/test-mixed-versions.yaml
workflow_dispatch:
jobs:
test-mixed-versions:
name: Test (Mixed Version Cluster)
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ EOF
"""

http_archive(
name = "rabbitmq-server-generic-unix-3.8.18",
name = "rabbitmq-server-generic-unix-3.8.22",
build_file = "@//:BUILD.package_generic_unix",
patch_cmds = [ADD_PLUGINS_DIR_BUILD_FILE],
strip_prefix = "rabbitmq_server-3.8.18",
urls = ["https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.18/rabbitmq-server-generic-unix-3.8.18.tar.xz"],
strip_prefix = "rabbitmq_server-3.8.22",
urls = ["https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.22/rabbitmq-server-generic-unix-3.8.22.tar.xz"],
)
4 changes: 2 additions & 2 deletions rabbitmq.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ def rabbitmq_integration_suite(
"RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
"RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
"RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),
"RABBITMQ_RUN_SECONDARY": "$TEST_SRCDIR/rabbitmq-server-generic-unix-3.8.18/rabbitmq-run",
"RABBITMQ_RUN_SECONDARY": "$TEST_SRCDIR/rabbitmq-server-generic-unix-3.8.22/rabbitmq-run",
}.items() + test_env.items()),
tools = [
":rabbitmq-for-tests-run",
"@rabbitmq-server-generic-unix-3.8.18//:rabbitmq-run",
"@rabbitmq-server-generic-unix-3.8.22//:rabbitmq-run",
] + tools,
runtime_deps = [
"//deps/rabbitmq_cli:elixir_as_bazel_erlang_lib",
Expand Down

0 comments on commit 59c4327

Please sign in to comment.