diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-09-21 20:17:46 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-09-21 20:17:46 +0300 |
| commit | 59c4327f0b4285743fcce717173e260338fb15f4 (patch) | |
| tree | d00b6433c83d125d8464673ac377b6a403c5a683 | |
| parent | 1c0904053386db3fc35c0e9a52d510d3896a1b48 (diff) | |
| parent | 0d54e71e8e1ef1f5fcac577fc49f5aaad0c5edb1 (diff) | |
| download | rabbitmq-server-git-59c4327f0b4285743fcce717173e260338fb15f4.tar.gz | |
Merge branch 'master' into shovel-obfuscatepassword
| -rw-r--r-- | .github/workflows/test-mixed-versions.yaml | 1 | ||||
| -rw-r--r-- | WORKSPACE.bazel | 6 | ||||
| -rw-r--r-- | rabbitmq.bzl | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/test-mixed-versions.yaml b/.github/workflows/test-mixed-versions.yaml index bec743a428..6eae46d065 100644 --- a/.github/workflows/test-mixed-versions.yaml +++ b/.github/workflows/test-mixed-versions.yaml @@ -17,6 +17,7 @@ on: - '*.bzl' - '*.bazel' - .github/workflows/test-mixed-versions.yaml + workflow_dispatch: jobs: test-mixed-versions: name: Test (Mixed Version Cluster) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 3aa381f754..62a17c6062 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -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"], ) diff --git a/rabbitmq.bzl b/rabbitmq.bzl index 35349050eb..ec9051518d 100644 --- a/rabbitmq.bzl +++ b/rabbitmq.bzl @@ -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", |