From 1e86d621e6b3661bd250b56a2012dd59017edde6 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:12:18 +0100
Subject: [PATCH] Fix some workflow issues (#3330)

---
 .github/workflows/build.yml     | 22 +++++++++++++---------
 bin/build-distribution-archives |  2 +-
 bin/build-python                | 19 ++++++-------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db552d4bf..698ea3260 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
         run: |
           make dist
         env:
-          BUILD: linux
+          BUILD: linux-old
           INKSTITCH_GPG_KEY: ${{ secrets.INKSTITCH_GPG_KEY }}
       - uses: actions/upload-artifact@v4
         with:
@@ -119,9 +119,6 @@ jobs:
           # for sigining
           sudo apt install rpm
 
-          # for GUI
-          sudo apt install python-wxgtk3.0-dev wxpython-tools
-
           uname -a
           python --version
           python -m pip --version
@@ -130,6 +127,8 @@ jobs:
           python -m pip install pycairo
           python -m pip install PyGObject
 
+          python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxPython-4.2.2-cp312-cp312-linux_x86_64.whl
+
           python -m pip install -r requirements.txt
           # for networkx
           python -m pip install pandas
@@ -150,7 +149,7 @@ jobs:
         run: |
           make dist
         env:
-          BUILD: linux
+          BUILD: linux-new
           INKSTITCH_GPG_KEY: ${{ secrets.INKSTITCH_GPG_KEY }}
       - uses: actions/upload-artifact@v4
         with:
@@ -248,7 +247,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: inkstitch-linux32
-          path: artifacts          
+          path: artifacts
   windows32:
     runs-on: windows-2019
     steps:
@@ -518,7 +517,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [linux32, linux, windows32, windows64, macx86, macarm64]
+    needs: [linux32, linux64-old, linux64-new, windows32, windows64, macx86, macarm64]
     if: always()
     steps:
       - name: determine release info
@@ -536,10 +535,15 @@ jobs:
             echo "prerelease=true" >> $GITHUB_ENV
             echo "title=development build of $branch" >> $GITHUB_ENV
           fi
-      - name: download linux
+      - name: download linux64-old
         uses: actions/download-artifact@v4
         with:
-          name: 'inkstitch-linux'
+          name: 'inkstitch-linux64-old'
+          path: 'artifacts/'
+      - name: download linux64-new
+        uses: actions/download-artifact@v4
+        with:
+          name: 'inkstitch-linux64-new'
           path: 'artifacts/'
       - name: download linux32
         uses: actions/download-artifact@v4
diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives
index eec3b0116..34085f3a1 100644
--- a/bin/build-distribution-archives
+++ b/bin/build-distribution-archives
@@ -104,7 +104,7 @@ if [ "$BUILD" = "windows" ]; then
     fi
 fi
 
-if [ "$BUILD" = "linux" ] || [ "$BUILD" = "linux32" ]; then
+if [ "$BUILD" = "linux" ] || [ "$BUILD" = "linux-new" ] || [ "$BUILD" = "linux-old" ] || [ "$BUILD" = "linux32" ]; then
     if [[ "$VERSION" =~ ^v[0-9][.0-9]+$ ]]; then
         VERSION=${VERSION#v}
     else
diff --git a/bin/build-python b/bin/build-python
index 522266309..13d2d8933 100755
--- a/bin/build-python
+++ b/bin/build-python
@@ -22,22 +22,19 @@ if [ "$BUILD" = "osx" ]; then
         echo "Dev or Local Build"
     else
         bash bin/import-macos-keys
+    python -m PyInstaller $pyinstaller_args inkstitch.py;
     fi
-fi
-
-if [ "$BUILD" = "linux" ]; then
+elif [ "$BUILD" = "linux" ] || [ "$BUILD" = "linux-new" ] || [ "$BUILD" = "linux-old" ]; then
     pyinstaller_args+="--hidden-import gi.repository.Gtk "
     pyinstaller_args+="--add-binary /lib/x86_64-linux-gnu/libcrypt.so.1:. "
     pyinstaller_args+="--add-binary /lib/x86_64-linux-gnu/libnsl.so.1:. "
-fi
-
-if [ "$BUILD" = "linux32" ]; then
+    python -m PyInstaller $pyinstaller_args --strip inkstitch.py;
+elif [ "$BUILD" = "linux32" ]; then
     pyinstaller_args+="--hidden-import gi.repository.Gtk "
     pyinstaller_args+="--add-binary /lib/i386-linux-gnu/libcrypt.so.1:. "
     pyinstaller_args+="--add-binary /lib/i386-linux-gnu/libnsl.so.1:. "
-fi
-
-if [ "$BUILD" = "windows" ]; then
+    python -m PyInstaller $pyinstaller_args --strip inkstitch.py;
+elif [ "$BUILD" = "windows" ]; then
 	if [[ "$VERSION" =~ ^v[0-9][.0-9]+$ ]]; then
 		# setting the file and product version for release
 		# Code to remove the periods in the version number
@@ -57,10 +54,6 @@ if [ "$BUILD" = "windows" ]; then
   pyinstaller_args+="-i images/inkstitch/win/inkstitch.ico "
 	pyinstaller_args+="--version-file  installer_scripts/file_version_info.txt "
     python -m PyInstaller $pyinstaller_args inkstitch.py
-elif [ "$BUILD" = "osx" ]; then
-    python -m PyInstaller $pyinstaller_args inkstitch.py;
-else
-    python -m PyInstaller $pyinstaller_args --strip inkstitch.py;
 fi
 
 # pyinstaller put a whole mess of libraries under dist/inkstitch.  We'd like