Skip to content
Open
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
3 changes: 2 additions & 1 deletion .docker/core-wasm.bake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ FROM ghcr.io/euro-office/emsdk:5.0.4 AS core-wasm
ARG BUILD_ROOT
ARG CACHE_BUST
ARG NUGET_SOURCE_PATH
ARG CMAKE_BUILD_PARALLEL_LEVEL=2

ENV BUILD_ROOT=${BUILD_ROOT}
ENV EM_CACHE=/em-cache
Expand All @@ -31,7 +32,7 @@ FROM ghcr.io/euro-office/emsdk:5.0.4 AS core-wasm
emcmake cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DEO_CORE_OUTPUT_DIR=/build-cache-wasm/dist /core
cmake --build . -- -j$(nproc)
cmake --build . --parallel "${CMAKE_BUILD_PARALLEL_LEVEL}"
ccache --show-stats
echo "=== CCACHE ON DISK ==="
du -sh /ccache || true
Expand Down
3 changes: 2 additions & 1 deletion .docker/core.bake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ FROM vcpkg-${NUGET_CACHE} AS core-base
#### CORE ####
FROM core-base AS core
ARG NUGET_SOURCE_PATH
ARG CMAKE_BUILD_PARALLEL_LEVEL=2
RUN --mount=type=cache,target=/build-cache \
--mount=type=bind,source=${NUGET_SOURCE_PATH},target=/nuget-cache,rw \
mkdir -p ${BUILD_ROOT} && \
Expand All @@ -161,5 +162,5 @@ FROM core-base AS core
-DEO_CORE_OUTPUT_DIR=/build-cache/package/bin \
-DEO_CORE_TOOLS_DIR=/build-cache/package/tools \
/core && \
cmake --build . && \
cmake --build . --parallel "${CMAKE_BUILD_PARALLEL_LEVEL}" && \
cp -r package/* ${BUILD_ROOT}