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

fix builds without guest module #196

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/element-with-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ jobs:
- name: Collect module source files
run: |
mv ../build_config.yaml e2e/src/deploy/elementWeb/
mv ../customisations.json e2e/src/deploy/elementWeb/ || ${{ matrix.guest == 'none' }}
if ${{ matrix.guest == 'none' }}; then rm e2e/src/deploy/elementWeb/customisations.json; else mv ../customisations.json e2e/src/deploy/elementWeb/; fi
mv ../nordeck-element-web-guest-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.guest, '@nordeck') || startsWith(matrix.guest, 'none') }}
mv ../nordeck-element-web-opendesk-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.opendesk, '@nordeck') || startsWith(matrix.opendesk, 'none') }}
mv ../nordeck-element-web-widget-lifecycle-module.tgz e2e/src/deploy/elementWeb/ || ${{ startsWith(matrix.lifecycle, '@nordeck') || startsWith(matrix.lifecycle, 'none') }}
Expand Down
3 changes: 2 additions & 1 deletion e2e/src/deploy/elementWeb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ RUN yarn --network-timeout=200000 install
# Add all configurations
COPY /*.tgz /src/
COPY /build_config.yaml /src
COPY /customisations.json /src
# COPY if exists (https://stackoverflow.com/a/70096420)
COPY /customisations.jso[n] /src

# Build Element
RUN bash /src/scripts/docker-package.sh
Expand Down
Loading