From 198fc57d937ee9c86f0be86bf62b253bfadbeb07 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Thu, 13 Nov 2025 23:07:42 +0100 Subject: [PATCH] Add explicit apps/server workdir for wasm tool install invocations (#1355) --- .github/workflows/dotnet-integration-tests.yml | 1 + .github/workflows/dotnet-unit-tests.yml | 1 + apps/server/AliasVault.Client/Dockerfile | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-integration-tests.yml b/.github/workflows/dotnet-integration-tests.yml index 3eb39ff8a..9c89d9018 100644 --- a/.github/workflows/dotnet-integration-tests.yml +++ b/.github/workflows/dotnet-integration-tests.yml @@ -24,6 +24,7 @@ jobs: dotnet-version: 9.0.x - name: Install dependencies + working-directory: apps/server run: dotnet workload install wasm-tools - name: Build diff --git a/.github/workflows/dotnet-unit-tests.yml b/.github/workflows/dotnet-unit-tests.yml index fae23d65d..49f455cb5 100644 --- a/.github/workflows/dotnet-unit-tests.yml +++ b/.github/workflows/dotnet-unit-tests.yml @@ -23,6 +23,7 @@ jobs: dotnet-version: 9.0.x - name: Install dependencies + working-directory: apps/server run: dotnet workload install wasm-tools - name: Restore dependencies diff --git a/apps/server/AliasVault.Client/Dockerfile b/apps/server/AliasVault.Client/Dockerfile index 70c3231b7..0f0321deb 100644 --- a/apps/server/AliasVault.Client/Dockerfile +++ b/apps/server/AliasVault.Client/Dockerfile @@ -14,11 +14,12 @@ RUN mkdir -p /src/msbuild-logs # Install Python which is required by the WebAssembly tools RUN apt-get update && apt-get install -y python3 && apt-get clean -# Install the WebAssembly tools +# Install the WebAssembly tools with correct dotnet version auto-detected from apps/server folder. +WORKDIR /src/apps/server RUN dotnet workload install wasm-tools # Copy all project files -COPY apps/server . +COPY apps/server /src # Build the Client project WORKDIR "/src/AliasVault.Client"