From f30f06ea13f5f41985454990fe11a468d3b259b0 Mon Sep 17 00:00:00 2001
From: Daniel Dybing <danieldy@uia.no>
Date: Wed, 11 Mar 2026 14:53:39 +0100
Subject: [PATCH] Workflow: Simplify Windows build and fix artifact path

---
 .gitea/workflows/build.yml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 3efc806..4634bdc 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -13,21 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-          
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          
-      - name: Build with PyInstaller
-        run: |
-          pyinstaller --onefile --name tamigo-cli tamigo.py
-          
+      - name: Build
+        run: pyinstaller --onefile --name tamigo-cli tamigo.py
       - name: Upload Linux Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -39,25 +34,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      
-      - name: Build Windows executable via Docker (Modern & Robust)
+      - name: Build Windows executable via Docker
         run: |
-          CONTAINER_NAME="builder-${{ github.run_id }}"
-          docker rm -f $CONTAINER_NAME || true
-          
-          # Using a more modern Python 3.10 image that handles paths better
-          docker create --name $CONTAINER_NAME burningtyger/pyinstaller-windows "pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
-          
-          docker cp . $CONTAINER_NAME:/src
-          docker start -a $CONTAINER_NAME
-          docker cp $CONTAINER_NAME:/src/dist .
-          docker rm $CONTAINER_NAME
+          # Use a very stable Wine+Python image
+          # We don't name the container to avoid conflicts, just use the image directly
+          docker run --rm \
+            -v "${{ github.workspace }}:/src" \
+            -w /src \
+            cdrx/pyinstaller-windows \
+            sh -c "pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
           
       - name: Debug - List output files
-        run: ls -R dist/
+        run: ls -R dist/ || echo "Dist folder not found"
           
       - name: Upload Windows Artifact
         uses: actions/upload-artifact@v3
         with:
           name: binary-windows
-          path: dist/*.exe
+          path: dist/windows/*.exe