chore: Update build workflow to simplify icon and settings handling f…

…or PyInstaller
techtanic · Nov 2, 2024 · 69763fc · 69763fc
1 parent 19bfa11
commit 69763fc
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,15 +13,11 @@ jobs:
       matrix:
         include:
           - name: "DUCE-GUI-windows"
-            icon: "extra/DUCE-LOGO.ico"
             mode: "-w"
             script: "gui.py"
-            settings: "default_settings_gui_settings.json"
           - name: "DUCE-CLI-windows"
-            icon: "extra/DUCE-LOGO.ico"
             mode: "-c"
             script: "cli.py"
-            settings: "default_settings_cli_settings.json"
     steps:
       - uses: actions/checkout@v4
 
@@ -36,13 +32,13 @@ jobs:
 
       - name: Build ${{ matrix.name }}
         run: >
-          pyinstaller -y -F ${{ matrix.mode }} -i "${{ matrix.icon }}" --clean --name "${{ matrix.name }}"
+          pyinstaller -y -F ${{ matrix.mode }} -i "extra/DUCE-LOGO.ico" --clean --name "${{ matrix.name }}"
           --add-data "base.py;."
           --add-data "colors.py;."
-          --add-data "${{ matrix.settings }};."
+          --add-data "default-duce-${{ matrix.script }}-settings.json;."
           --add-data "README.md;."
           --add-data "LICENSE;."
-          "${{ matrix.script }}"
+          "${{ matrix.script }}.py"
 
       - name: Upload ${{ matrix.name }}.exe
         uses: actions/upload-artifact@v4