From 334ceae3ea3b6b72b2ff710e0b6f05448f98713f Mon Sep 17 00:00:00 2001 From: Daniel Dybing Date: Wed, 11 Mar 2026 14:13:03 +0100 Subject: [PATCH] Workflow: Simplify Windows Docker build by using image defaults --- .gitea/workflows/build.yml | 9 +++++---- .gitea/workflows/release.yml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 0836d36..f7c72fb 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,15 +40,16 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Build Windows executable via Docker (Modern) + - name: Build Windows executable via Docker (Stable) run: | - # Use a modern Python 3.12 image for Windows cross-compilation - docker create --name builder --entrypoint /bin/sh tobix/pyinstaller-windows:py312 -c "pip install --upgrade pip && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py" + # Use a standard Wine-based PyInstaller image + docker create --name builder cdrx/pyinstaller-windows # Copy source code into the container docker cp . builder:/src - # Start the container and wait + # Run the build using the image's internal logic but specifying our requirements + # Most of these images default to running 'pyinstaller' on the /src folder docker start -a builder # Copy the results back diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index eb348c3..fe1fd95 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -34,9 +34,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Build Windows executable via Docker (Modern) + - name: Build Windows executable via Docker (Stable) run: | - docker create --name release_builder --entrypoint /bin/sh tobix/pyinstaller-windows:py312 -c "pip install --upgrade pip && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py" + docker create --name release_builder cdrx/pyinstaller-windows docker cp . release_builder:/src docker start -a release_builder docker cp release_builder:/src/dist .