From 359636b152696315ef7fa07630d9e8b0021393c2 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Sat, 14 Mar 2026 01:18:08 +0100
Subject: [PATCH] ci(artifacts): simplify uploaded artifacts

---
 .github/workflows/action.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index fd14414..bd6706c 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -36,14 +36,16 @@ jobs:
         run: |
             nix develop --no-pure-eval --accept-flake-config --command just audit
 
-      - name: Build
-        run: |
-            nix develop --no-pure-eval --accept-flake-config --command just build-release
-
       - name: Lint
         run: |
             nix develop --no-pure-eval --accept-flake-config --command just lint-report
 
+      - name: Build Linux release binary
+        run: nix build --no-pure-eval --accept-flake-config
+
+      - name: Build Windows release binary
+        run: nix build .#windows --no-pure-eval --accept-flake-config
+
       - name: Coverage
         run: |
             nix develop --no-pure-eval --accept-flake-config --command just coverage-ci
@@ -54,26 +56,26 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
 
-      - name: Build Linux release binary
-        run: nix build --no-pure-eval --accept-flake-config
-
-      - name: Package Linux binary
-        run: mv result/bin/jj-cz && zip jj-cz-linux-x86_64.zip jj-cz LICENSE.GPL.md LICENSE.MIT.md
+      - name: Prepare Linux binary
+        run: |
+            mkdir dist-linux
+            cp result/bin/jj-cz dist-linux/
+            cp LICENSE.*.md dist-linux/
 
       - name: Upload Linux artifact
         uses: actions/upload-artifact@v3
         with:
           name: jj-cz-linux-x86_64
-          path: jj-cz-linux-x86_64.zip
+          path: dist-linux/*
 
-      - name: Build Windows release binary
-        run: nix build .#windows --no-pure-eval --accept-flake-config
-
-      - name: Package Windows binary
-        run: zip jj-cz-windows-x86_64.zip result/bin/jj-cz.exe LICENSE.GPL.md LICENSE.MIT.md
+      - name: Prepare Windows binary
+        run: |
+            mkdir -p dist-windows
+            cp result/bin/jj-cz.exe dist-windows/
+            cp LICENSE.*.md dist-windows/
 
       - name: Upload Windows artifact
         uses: actions/upload-artifact@v3
         with:
           name: jj-cz-windows-x86_64
-          path: jj-cz-windows-x86_64.zip
+          path: dist-windows/*