Skip to content

Commit 9f60ffa

Browse files
committed
Fix build process
Again, RMQ Makefile was wiping the `plugins` folder so we had to fix the `EXTRA_DIST_EZS` whitelist. Most likely, absolute path were expected when applying the filter. Signed-off-by: Matteo Cafasso <[email protected]>
1 parent 8e89d7e commit 9f60ffa

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.github/workflows/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ jobs:
3434
working-directory: ${{ env.PLUGIN_FOLDER }}
3535
run: |
3636
make current_rmq_ref=${{ matrix.rmqref }}
37-
make deps
3837
make tests current_rmq_ref=${{ matrix.rmqref }}
3938
- name: Build distribution files
4039
working-directory: ${{ env.PLUGIN_FOLDER }}
4140
run: |
42-
DIST_AS_EZS=yes make dist current_rmq_ref=${{ matrix.rmqref }}
41+
MIX_ENV=prod DIST_AS_EZS=yes make dist current_rmq_ref=${{ matrix.rmqref }}
4342
- name: Store build artifacts
4443
uses: actions/upload-artifact@v3
4544
with:

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
88
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
99

1010
# Mix customizations
11-
1211
MIX_ENV ?= dev
1312
override MIX := mix
1413
elixir_srcs := mix.exs
@@ -17,17 +16,15 @@ elixir_srcs := mix.exs
1716
# which is not managed by erlang.mk.
1817
# We need to instruct the `rabbitmq-dist:do-dist` target to not
1918
# remove our plugin and related dependencies.
20-
ELIXIR_ARCHIVE = $(shell ls plugins/elixir-*.ez)
21-
PROJECT_ARCHIVE = $(shell ls plugins/$(PROJECT)-*.ez)
22-
EXTRA_DIST_EZS = $(ELIXIR_ARCHIVE) $(PROJECT_ARCHIVE)
19+
EXTRA_DIST_EZS = $(shell find $(PWD)/plugins -name *.ez)
2320

2421
app:: $(elixir_srcs) deps
2522
$(MIX) make_app
2623

2724
dist:: app
2825
mkdir -p $(DIST_DIR)
29-
MIX_ENV=prod $(MIX) archive.build.elixir
30-
MIX_ENV=prod $(MIX) archive.build -o $(DIST_DIR)/$(PROJECT)-$(PROJ_VSN).ez
26+
$(MIX) archive.build.elixir
27+
$(MIX) archive.build -o $(DIST_DIR)/$(PROJECT)-$(PROJ_VSN).ez
3128
cp -r _build/$(MIX_ENV)/archives/elixir-*.ez $(DIST_DIR)
3229

3330
test-build:: app

0 commit comments

Comments
 (0)