From 3006a82a0f8dde672a3d67826551ec7338425bec Mon Sep 17 00:00:00 2001 From: opti1337 Date: Tue, 23 Dec 2025 22:03:09 +0600 Subject: [PATCH] update --- .gitea/workflows/deploy-client.yml | 4 ++-- client/Dockerfile.windows | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index 0962c29..7002907 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -36,14 +36,14 @@ jobs: --build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} docker create --name chad-client-windows-container chad-client-windows-builder - docker cp chad-client-windows-container:/app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis ./nsis + docker cp chad-client-windows-container:/ ./artifacts docker rm chad-client-windows-container - name: Publish uses: akkuman/gitea-release-action@v1 with: files: | - nsis/** + artifacts/** draft: true # publish-web: diff --git a/client/Dockerfile.windows b/client/Dockerfile.windows index a30dae5..fb18651 100644 --- a/client/Dockerfile.windows +++ b/client/Dockerfile.windows @@ -1,13 +1,13 @@ -FROM node:lts +# === Build === +FROM node:lts as builder WORKDIR /app -RUN corepack enable yarn -RUN yarn set version stable +RUN corepack enable yarn && yarn set version stable COPY package.json yarn.lock .yarnrc.yml ./ -RUN yarn install +RUN yarn install --immutable COPY . . ARG COMMIT_SHA=unknown @@ -19,11 +19,12 @@ ENV COMMIT_SHA=$COMMIT_SHA \ TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \ TAURI_SIGNING_PRIVATE_KEY_PASSWORD= -RUN apt update && apt install -y \ +RUN apt update && apt install -y --no-install-recommends \ nsis \ clang \ lld \ - llvm + llvm \ + && rm -rf /var/lib/apt/lists/* RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y @@ -37,4 +38,8 @@ RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc RUN node scripts/generate-updater.mjs -RUN ls -la +# === Artifacts === +FROM scratch AS artifacts + +COPY --from=builder /app/src-tauri/target/release/bundle/nsis/ / +COPY --from=builder /app/updater.json /