From 621e933f63cc8a14c7edd2f61a901a939f2d4f61 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 20 Apr 2024 18:02:10 +0200
Subject: [PATCH] Make some tweaks to build scripts

---
 .github/workflows/build.yml | 16 ++++++++++++----
 setup/macos/build.sh        | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 92718e8a..879cc42f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Python Setup
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.11"
           architecture: x64
 
       - name: Install Packages (pip)
@@ -76,7 +76,11 @@ jobs:
 
   buildMac-AMD64:
     needs: buildAssets
-    runs-on: macos-12
+    runs-on: macos-13
+    env:
+      PYTHON_VERSION: "3.12"
+      ARCHITECTURE: amd64
+      MINICONDA_ARCH: x86_64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -88,7 +92,7 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh amd64
+        run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
@@ -101,6 +105,10 @@ jobs:
   buildMac-M1:
     needs: buildAssets
     runs-on: macos-14
+    env:
+      PYTHON_VERSION: "3.12"
+      ARCHITECTURE: arm64
+      MINICONDA_ARCH: arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -112,7 +120,7 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh arm64
+        run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
diff --git a/setup/macos/build.sh b/setup/macos/build.sh
index 1304488a..8c127fc8 100755
--- a/setup/macos/build.sh
+++ b/setup/macos/build.sh
@@ -1,15 +1,21 @@
 #! /bin/bash
 
 if [ -z "$1"]; then
-    ARCH="amd64"
+    PYTHON="3.11"
 else
-    ARCH="$1"
+    PYTHON="$1"
 fi
 
-if [ $ARCH == "amd64 "]; then
+if [ -z "$2"]; then
+    ARCH="amd64"
+else
+    ARCH="$2"
+fi
+
+if [ -z "$3"]; then
     CONDA="x86_64"
 else
-    CONDA="$ARCH"
+    CONDA="$3"
 fi
 
 # Use RAM disk if possible
@@ -94,7 +100,7 @@ rm Miniconda3-latest-MacOSX-$CONDA.sh
 export PATH="$HOME/miniconda/bin:$PATH"
 
 echo "Creating Conda env ..."
-conda create -n novelWriter -c conda-forge python=3.11 --yes
+conda create -n novelWriter -c conda-forge python=$PYTHON --yes
 source activate novelWriter
 
 echo "Installing dictionaries ..."