Merge pull request #53 from gotthardp/rabbitmq-email-52

Update for RabbitMQ 3.10, 3.11
gotthardp · Oct 14, 2022 · dd0da3d · dd0da3d
2 parents a345674 + 38356e3
commit dd0da3d
Show file tree

Hide file tree

Showing 5 changed files with 349 additions and 136 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,13 +15,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp-version: [23, 24]
+        otp-version: [23, 24, 25]
+        elixir-version: ['1.14']
     steps:
       - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: ${{matrix.otp-version}}
-          elixir-version: 1.11.4
+          otp-version: ${{ matrix.otp-version }}
+          elixir-version: ${{ matrix.elixir-version }}
       - name: Compile
         run: make
       - name: Test

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.ignore
 .sw?
 .*.sw?
 *.beam

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PROJECT = rabbitmq_email
 PROJECT_DESCRIPTION = RabbitMQ plugin that converts incoming emails into messages and messages into outgoing emails
-RABBITMQ_VERSION ?= v3.9.x
+RABBITMQ_VERSION ?= v3.11.x
 
 # Note: must be the same version as in rabbitmq-components.mk
 DEP_RANCH_VERSION = 2.1.0
@@ -40,13 +40,6 @@ distclean:: delete-test/system_SUITE_data/samples.zip
 	@:
 
 include rabbitmq-components.mk
-
-dep_amqp_client                = git_rmq-subfolder rabbitmq-erlang-client $(RABBITMQ_VERSION)
-dep_rabbit_common              = git_rmq-subfolder rabbitmq-common $(RABBITMQ_VERSION)
-dep_rabbit                     = git_rmq-subfolder rabbitmq-server $(RABBITMQ_VERSION)
-dep_rabbitmq_ct_client_helpers = git_rmq-subfolder rabbitmq-ct-client-helpers $(RABBITMQ_VERSION)
-dep_rabbitmq_ct_helpers        = git_rmq-subfolder rabbitmq-ct-helpers $(RABBITMQ_VERSION)
-
 include erlang.mk
 
 autopatch-gen_smtp::
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    .ignore
     .sw?
     .*.sw?
     *.beam
@@ Expand Down @@