From 5f5a8d08ddd35636f5dd25740ecafaee2d6a5a75 Mon Sep 17 00:00:00 2001
From: KTrain5369 <69028025+KTrain5169@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:48:12 +1000
Subject: [PATCH] Squash merge branch debugging-workflow at
 a4ce46094fc7d699ed66a5e9d72dd13dbf248864

Fixes PyInstaller by pinning it to the (at this time) development commit 7ebb7014a47f635a2475e4047714f45578f03dec
---
 .github/workflows/script-build.yml   | 3 +++
 .github/workflows/script-release.yml | 5 +++--
 requirements.txt                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/script-build.yml b/.github/workflows/script-build.yml
index 6a8824b..e6ff8da 100644
--- a/.github/workflows/script-build.yml
+++ b/.github/workflows/script-build.yml
@@ -4,9 +4,11 @@ on:
     push:
       paths:
         - 'script.py'
+        - 'requirements.txt'
     pull_request:
       paths:
         - 'script.py'
+        - 'requirements.txt'
     workflow_dispatch:
 
 jobs:
@@ -30,6 +32,7 @@ jobs:
             - name: Install requirements
               run: |
                 pip install -r requirements.txt
+                pip install https://github.com/pyinstaller/pyinstaller/archive/7ebb7014a47f635a2475e4047714f45578f03dec.zip
 
             - name: PyInstaller
               run: pyinstaller script.py --name CatPack_Crafter_${{ github.sha }}_${{ matrix.os }}
diff --git a/.github/workflows/script-release.yml b/.github/workflows/script-release.yml
index f740998..0984174 100644
--- a/.github/workflows/script-release.yml
+++ b/.github/workflows/script-release.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Install requirements
         run: |
           pip install -r requirements.txt
+          pip install https://github.com/pyinstaller/pyinstaller/archive/7ebb7014a47f635a2475e4047714f45578f03dec.zip
 
       - name: PyInstaller
         run: pyinstaller --onefile --windowed script.py --name CatPack_Crafter_${{ github.ref_name }}_${{ matrix.os }}
@@ -82,7 +83,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           generateReleaseNotes: true
           tag: ${{ github.ref_name }}
-          artifacts: 
+          artifacts: CatPack_Crafter_${{ github.ref_name }}_*
           draft: true
-          name: "CatPack_Crafter_${{ github.ref_name }}_*"
+          name: "CatPack_Crafter_${{ github.ref_name }}"
           body: "Need help? Refer to the documentation site."
diff --git a/requirements.txt b/requirements.txt
index 13a7522..8de5c1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 pillow==11.0.0
 
 # Compiling
-pyinstaller==6.11.0
+https://github.com/pyinstaller/pyinstaller/archive/7ebb7014a47f635a2475e4047714f45578f03dec.zip # idk if this actually works or not
 
 # Documentation
 mkdocs==1.6.1