Skip to content

Commit 2010b62

Browse files
committed
build needs elixir
1 parent 0144735 commit 2010b62

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ jobs:
99
strategy:
1010
matrix:
1111
PLATFORM:
12-
- { RMQREF: "v4.0.x", ERLVER: "26.2" }
13-
- { RMQREF: "v4.1.x", ERLVER: "27" }
14-
name: "Broker: ${{ matrix.PLATFORM.RMQREF }} - Erlang: ${{ matrix.PLATFORM.ERLVER }}"
12+
- { RMQREF: "4.0.9", ERLVER: "26.2", ELXVER: "1.16" }
13+
- { RMQREF: "4.1.4", ERLVER: "27", ELXVER: "1.18" }
14+
name: "Broker: ${{ matrix.PLATFORM.RMQREF }} - Erlang: ${{ matrix.PLATFORM.ERLVER }} - Elixir: ${{ matrix.PLATFORM.ELXVER }}"
1515
steps:
1616
- name: Checkout RabbitMQ Server
1717
uses: actions/checkout@v4
1818
with:
1919
repository: rabbitmq/rabbitmq-server
20+
ref: v${{ matrix.PLATFORM.RMQREF }}
2021
path: ${{ env.SERVER_FOLDER }}
2122
- name: Checkout Plugin
2223
uses: actions/checkout@v4
@@ -26,13 +27,14 @@ jobs:
2627
uses: erlef/setup-beam@v1
2728
with:
2829
otp-version: ${{ matrix.PLATFORM.ERLVER }}
30+
elixir-version: ${{ matrix.PLATFORM.ELXVER }}
2931
- name: Build distribution files
3032
working-directory: ${{ env.PLUGIN_FOLDER }}
3133
run: |
32-
make dist RABBITMQ_VERSION=${{ matrix.PLATFORM.RMQREF }} MIX_ENV=prod DIST_AS_EZS=yes
34+
make dist RABBITMQ_VERSION=${{ matrix.PLATFORM.RMQREF }} MIX_ENV=prod DIST_AS_EZS=yes IS_DEP=true
3335
- name: Store build artifacts
3436
uses: actions/upload-artifact@v4
3537
with:
36-
name: plugins-ocpp-rmq${{ matrix.PLATFORM.RMQREF }}-erl${{ matrix.PLATFORM.ERLVER }}
38+
name: plugins-ocpp-rmq${{ matrix.PLATFORM.RMQREF }}-erl${{ matrix.PLATFORM.ERLVER }}-elx${{ matrix.PLATFORM.ELXVER }}
3739
path: |
3840
${{ env.PLUGIN_FOLDER }}/plugins/rabbitmq_web_ocpp-[0-9].*.ez

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LOCAL_DEPS = ssl
1717
DEPS = rabbit cowboy
1818
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_stomp rabbitmq_consistent_hash_exchange
1919

20-
PLT_APPS += rabbitmq_cli elixir cowlib
20+
PLT_APPS += rabbitmqctl elixir cowlib
2121

2222
# FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.
2323
# See rabbitmq-components.mk.

src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%%
55
%% Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
66

7-
-module('Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand').
7+
-module('Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebOcppConnectionsCommand').
88

99
-include_lib("rabbit_web_ocpp.hrl").
1010

@@ -30,7 +30,7 @@ scopes() -> [ctl, diagnostics].
3030
switches() -> [{verbose, boolean}].
3131
aliases() -> [{'V', verbose}].
3232

33-
description() -> <<"Lists all Web MQTT connections">>.
33+
description() -> <<"Lists all Web OCPP connections">>.
3434

3535
help_section() ->
3636
{plugin, web_ocpp}.

0 commit comments

Comments
 (0)