Update Dockerfile.windows

.gitea/workflows/deploy-client.yml

@@ -5,9 +5,9 @@ on:
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
 
-    paths:
+    # paths:
-      - ".gitea/workflows/deploy-client.yml"
+    #   - ".gitea/workflows/deploy-client.yml"
-      - "client/**"
+    #   - "client/**"
 
 jobs:
   publish-windows:
@@ -36,14 +36,16 @@ 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
+          mkdir -p artifacts
+          docker cp chad-client-windows-container:/artifacts artifacts/
           docker rm chad-client-windows-container
+          ls -la artifacts
 
       - name: Publish
         uses: akkuman/gitea-release-action@v1
         with:
           files: |
-            nsis/**
+            artifacts/**
           draft: true
 
   # publish-web:

client/.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

client/.gitignore

@@ -23,6 +23,7 @@ logs
 .env.*
 !.env.example
 
+.pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
@@ -32,3 +33,5 @@ logs
 
 scripts/release.ps1
 .tauri
+
+updater.json

client/.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

client/Dockerfile.windows

@@ -1,13 +1,14 @@
-FROM node:lts
+# === Build ===
+FROM node:lts AS builder
 
 WORKDIR /app
 
-RUN corepack enable yarn
+# RUN corepack enable yarn && yarn set version stable
-RUN yarn set version stable
 
 COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn ./.yarn
 
-RUN yarn install
+RUN yarn install --immutable
 COPY . .
 
 ARG COMMIT_SHA=unknown
@@ -19,11 +20,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
 
@@ -35,6 +37,12 @@ RUN cargo install --locked cargo-xwin
 
 RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
 
-RUN node scripts/generate-updater.js
+RUN node scripts/generate-updater.mjs
 
-RUN ls -la
+# === Artifacts ===
+FROM scratch AS artifacts
+
+COPY --from=builder /app/updater.json ./artifacts
+COPY --from=builder /app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/ ./artifacts
+
+CMD ["true"]

client/package.json

@@ -29,7 +29,7 @@
     "vue": "^3.5.22",
     "vue-router": "^4.5.1"
   },
-  "packageManager": "yarn@4.10.3",
+  "packageManager": "yarn@4.12.0",
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
     "@primevue/nuxt-module": "^4.4.0",

client/scripts/generate-updater.mjs

@@ -13,11 +13,11 @@ const BASE_URL = 'https://git.koptilnya.xyz/opti1337/chad/releases/download/late
 
 const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
 const tauriConf = JSON.parse(tauriConfRaw)
-const version = tauriConf.package.version
+const version = tauriConf.version
 
 const SIG_FILE = path.resolve(
   __dirname,
-  `../src-tauri/target/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
+  `../src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
 )
 
 const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()

yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-