Skip to content

Commit 5277fff

Browse files
committed
Update for RabbitMQ 3.13
Fixes #263 Address @pjk25 review comment Remove OTP 25 since RMQ 3.13 does NOT support it. Apply fix proposed by @dumbbell update mk files Remove 3.11 (cherry picked from commit 08c3571)
1 parent 752c59d commit 5277fff

File tree

10 files changed

+632
-1055
lines changed

10 files changed

+632
-1055
lines changed

.bazelrc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,11 @@ build:rbe --host_platform=@rabbitmq-server//bazel/platforms:erlang_internal_plat
3939
build:rbe --host_cpu=k8
4040
build:rbe --cpu=k8
4141

42-
build:rbe-24 --config=rbe
43-
build:rbe-24 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_24_platform
42+
build:rbe-25_3 --config=rbe
43+
build:rbe-25_3 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_25_3_platform
4444

45-
build:rbe-25 --config=rbe
46-
build:rbe-25 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_25_3_platform
47-
48-
build:rbe-26 --config=rbe
49-
build:rbe-26 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_26_platform
45+
build:rbe-26_2 --config=rbe
46+
build:rbe-26_2 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_26_2_platform
5047

5148
# Try importing a user specific .bazelrc
5249
# You can create your own by copying and editing the template-user.bazelrc template:

.github/workflows/nightly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
bazel_otp_name:
12-
- "25"
12+
- "26_2"
1313
branch:
14-
- main
15-
- v3.12.x
16-
- v3.11.x
14+
- main
15+
- v3.13.x
16+
- v3.12.x
1717
uses: rabbitmq/rabbitmq-lvc-exchange/.github/workflows/bazel-test-nightly.yml@main
1818
with:
1919
bazel_otp_name: ${{ matrix.bazel_otp_name }}

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ on:
33
push:
44
branches:
55
- main
6+
- v3.13.x
67
- v3.12.x
7-
- v3.11.x
88
pull_request:
99
jobs:
1010
test:
1111
strategy:
1212
fail-fast: false
1313
matrix:
1414
bazel_otp_name:
15-
- "25"
16-
- "26"
15+
- "26_2"
1716
uses: rabbitmq/rabbitmq-lvc-exchange/.github/workflows/bazel-test.yml@main
1817
with:
1918
bazel_otp_name: ${{ matrix.bazel_otp_name }}

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rabbitmq_delayed_message_exchange",
3-
version = "3.12.0",
3+
version = "3.13.0",
44
)
55

66
bazel_dep(
@@ -32,9 +32,9 @@ bazel_dep(
3232

3333
archive_override(
3434
module_name = "rabbitmq-server",
35-
strip_prefix = "rabbitmq-server-main",
35+
strip_prefix = "rabbitmq-server-3.13.x",
3636
urls = [
37-
"https://github.com/rabbitmq/rabbitmq-server/archive/refs/heads/main.zip",
37+
"https://github.com/rabbitmq/rabbitmq-server/archive/refs/heads/v3.13.x.zip",
3838
],
3939
)
4040

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PROJECT = rabbitmq_delayed_message_exchange
22
PROJECT_DESCRIPTION = RabbitMQ Delayed Message Exchange
33
PROJECT_MOD = rabbit_delayed_message_app
44

5-
RABBITMQ_VERSION ?= v3.10.x
5+
RABBITMQ_VERSION ?= v3.13.x
66

77
define PROJECT_APP_EXTRA_KEYS
8-
{broker_version_requirements, ["3.10.0"]}
8+
{broker_version_requirements, ["3.13.0"]}
99
endef
1010

1111
dep_amqp_client = git_rmq-subfolder rabbitmq-erlang-client $(RABBITMQ_VERSION)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ of some kind.
3131

3232
## Supported RabbitMQ Versions
3333

34-
The most recent release of this plugin targets RabbitMQ 3.12.x.
34+
The most recent release of this plugin targets RabbitMQ 3.13.x.
3535

3636
## Supported Erlang/OTP Versions
3737

38-
The latest version of this plugin [requires Erlang 25.0 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.12.x.
38+
The latest version of this plugin [requires Erlang 26.0 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.13.x.
3939

4040
## Project Maturity
4141

@@ -199,7 +199,7 @@ The EZ file is created in the `bazel-bin` directory.
199199

200200
1. Update `broker_version_requirements` in `helpers.bzl` & `Makefile` (Optional)
201201
1. Update the plugin version in `MODULE.bazel`
202-
1. Push a tag (i.e. `v3.12.0`) with the matching version
202+
1. Push a tag (i.e. `v3.13.0`) with the matching version
203203
1. Allow the Release workflow to run and create a draft release
204204
1. Review and publish the release
205205

0 commit comments

Comments
 (0)