Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 457f24d

Browse files
committed
fix builds without guest module
The guest module requires the customisations.json with certain settings. The previous condition did not properly remove the file when the guest module was not included in the build. This updated condition actively removes the file and updates the Dockerfile to not fail when it does not exist. Signed-off-by: Kim Brose <[email protected]>
1 parent ecc21f1 commit 457f24d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/element-with-modules.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ jobs:
332332
- name: Collect module source files
333333
run: |
334334
mv ../build_config.yaml e2e/src/deploy/elementWeb/
335-
mv ../customisations.json e2e/src/deploy/elementWeb/ || ${{ matrix.guest == 'none' }}
335+
if ${{ matrix.guest == 'none' }}; then rm e2e/src/deploy/elementWeb/customisations.json; else mv ../customisations.json e2e/src/deploy/elementWeb/; fi
336336
mv ../nordeck-element-web-guest-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.guest, '@nordeck') || startsWith(matrix.guest, 'none') }}
337337
mv ../nordeck-element-web-opendesk-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.opendesk, '@nordeck') || startsWith(matrix.opendesk, 'none') }}
338338
mv ../nordeck-element-web-widget-lifecycle-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.lifecycle, '@nordeck') || startsWith(matrix.lifecycle, 'none') }}

e2e/src/deploy/elementWeb/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ RUN yarn --network-timeout=200000 install
1616
# Add all configurations
1717
COPY /*.tgz /src/
1818
COPY /build_config.yaml /src
19-
COPY /customisations.json /src
19+
# COPY if exists (https://stackoverflow.com/a/70096420)
20+
COPY /customisations.jso[n] /src
2021

2122
# Build Element
2223
RUN bash /src/scripts/docker-package.sh

0 commit comments

Comments
 (0)