From bcd669c2ac23d5cb5a3b8349b3f7578fc726edc7 Mon Sep 17 00:00:00 2001
From: Tim Davies <timdavies@me.com>
Date: Fri, 1 Mar 2024 16:14:05 +0000
Subject: [PATCH] Switch to a specific pyinstaller release to avoid errors when
 bundling

---
 .github/workflows/release.yml | 39 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8429e2e..844dd8d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,19 +13,19 @@ jobs:
           - os: linux
             arch: x86_64
             runs: ubuntu-latest
-            ext: ''
+            ext: ""
           - os: windows
             arch: x86_64
             runs: windows-latest
-            ext: '.exe'
+            ext: ".exe"
           - os: macos
             arch: x86_64
             runs: macos-12
-            ext: ''
+            ext: ""
           - os: macos
             arch: arm64
             runs: macos-14
-            ext: ''
+            ext: ""
 
     runs-on: ${{ matrix.runs }}
     steps:
@@ -34,17 +34,17 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.11'
+          python-version: "3.11"
           architecture: x64 # Otherwise the runner will try to download Python arm64, which is not available. x64 has support for both archs (universal2).
       - name: Install latest stable
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: stable
-            override: true
+          toolchain: stable
+          override: true
       - name: Build
         run: |
           python -m pip install --upgrade pip
-          pip install pyinstaller
+          pip install "pyinstaller>=5.12"
           pip install certifi
           pip install maturin
           pip install .[fast]
@@ -56,10 +56,10 @@ jobs:
       - name: zip release
         uses: thedoctor0/zip-release@main
         with:
-          type: 'zip'
-          filename: 'fig2sketch-${{ matrix.os }}-${{ matrix.arch }}.zip'
-          directory: 'dist'
-          path: '*'
+          type: "zip"
+          filename: "fig2sketch-${{ matrix.os }}-${{ matrix.arch }}.zip"
+          directory: "dist"
+          path: "*"
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -67,7 +67,7 @@ jobs:
           path: dist/fig2sketch-${{ matrix.os }}-${{ matrix.arch }}.zip
 
   build-macos-universal:
-    needs: [ build ]
+    needs: [build]
     runs-on: macos-latest
     steps:
       - name: Download artifact
@@ -97,19 +97,18 @@ jobs:
       - name: zip release
         uses: thedoctor0/zip-release@main
         with:
-          type: 'zip'
-          filename: 'fig2sketch-macos-universal.zip'
-          directory: 'dist'
-          path: '*'
+          type: "zip"
+          filename: "fig2sketch-macos-universal.zip"
+          directory: "dist"
+          path: "*"
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           name: builds
           path: dist/fig2sketch-macos-universal.zip
 
-
   create-release:
-    needs: [ build, build-macos-universal ]
+    needs: [build, build-macos-universal]
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -132,7 +131,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - name: Install build tools
         run: pip install build
       - name: Build source distribution