Skip to content

Commit

Permalink
Update for RabbitMQ 3.13
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
lukebakken committed Mar 11, 2024
1 parent 752c59d commit 5277fff
Show file tree
Hide file tree
Showing 10 changed files with 632 additions and 1,055 deletions.
11 changes: 4 additions & 7 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,11 @@ build:rbe --host_platform=@rabbitmq-server//bazel/platforms:erlang_internal_plat
build:rbe --host_cpu=k8
build:rbe --cpu=k8

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

build:rbe-25 --config=rbe
build:rbe-25 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_25_3_platform

build:rbe-26 --config=rbe
build:rbe-26 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_26_platform
build:rbe-26_2 --config=rbe
build:rbe-26_2 --platforms=@rabbitmq-server//bazel/platforms:erlang_linux_26_2_platform

# Try importing a user specific .bazelrc
# You can create your own by copying and editing the template-user.bazelrc template:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
fail-fast: false
matrix:
bazel_otp_name:
- "25"
- "26_2"
branch:
- main
- v3.12.x
- v3.11.x
- main
- v3.13.x
- v3.12.x
uses: rabbitmq/rabbitmq-lvc-exchange/.github/workflows/bazel-test-nightly.yml@main
with:
bazel_otp_name: ${{ matrix.bazel_otp_name }}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ on:
push:
branches:
- main
- v3.13.x
- v3.12.x
- v3.11.x
pull_request:
jobs:
test:
strategy:
fail-fast: false
matrix:
bazel_otp_name:
- "25"
- "26"
- "26_2"
uses: rabbitmq/rabbitmq-lvc-exchange/.github/workflows/bazel-test.yml@main
with:
bazel_otp_name: ${{ matrix.bazel_otp_name }}
Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module(
name = "rabbitmq_delayed_message_exchange",
version = "3.12.0",
version = "3.13.0",
)

bazel_dep(
Expand Down Expand Up @@ -32,9 +32,9 @@ bazel_dep(

archive_override(
module_name = "rabbitmq-server",
strip_prefix = "rabbitmq-server-main",
strip_prefix = "rabbitmq-server-3.13.x",
urls = [
"https://github.com/rabbitmq/rabbitmq-server/archive/refs/heads/main.zip",
"https://github.com/rabbitmq/rabbitmq-server/archive/refs/heads/v3.13.x.zip",
],
)

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ PROJECT = rabbitmq_delayed_message_exchange
PROJECT_DESCRIPTION = RabbitMQ Delayed Message Exchange
PROJECT_MOD = rabbit_delayed_message_app

RABBITMQ_VERSION ?= v3.10.x
RABBITMQ_VERSION ?= v3.13.x

define PROJECT_APP_EXTRA_KEYS
{broker_version_requirements, ["3.10.0"]}
{broker_version_requirements, ["3.13.0"]}
endef

dep_amqp_client = git_rmq-subfolder rabbitmq-erlang-client $(RABBITMQ_VERSION)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ of some kind.

## Supported RabbitMQ Versions

The most recent release of this plugin targets RabbitMQ 3.12.x.
The most recent release of this plugin targets RabbitMQ 3.13.x.

## Supported Erlang/OTP Versions

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.
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.

## Project Maturity

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

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

Expand Down
Loading

0 comments on commit 5277fff

Please sign in to comment.