From 88d4627d7114f090d9e631d053a203bba351721d Mon Sep 17 00:00:00 2001
From: MrStevns <CandyFace18@gmail.com>
Date: Fri, 26 Apr 2024 21:23:38 +0200
Subject: [PATCH 1/2] Fix build server only deploys arm64 macOS binaries

By introducing another runner, so we can deploy arm64 and intel separately
---
 .github/actions/create-package/create-package.sh | 5 +++--
 .github/workflows/ci.yml                         | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/actions/create-package/create-package.sh b/.github/actions/create-package/create-package.sh
index 7167321f2a..3b1931c86d 100755
--- a/.github/actions/create-package/create-package.sh
+++ b/.github/actions/create-package/create-package.sh
@@ -98,8 +98,9 @@ create_package_macos() {
   popd >/dev/null
   echo "Create ZIP"
   local qtsuffix="-qt${INPUT_QT}"
-  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-$3.zip" Pencil2D
-  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-$3" > "${GITHUB_OUTPUT}"
+  local arch=`uname -m`
+  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-${arch}.zip" Pencil2D
+  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}" > "${GITHUB_OUTPUT}"
 }
 
 create_package_windows() {
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e340cc808a..1678756119 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,10 @@ jobs:
           container: { image: "ubuntu:16.04", options: --privileged }
           qt: 5
         - name: Qt 5 / macOS x86_64
+          os: macos-12
+          container:
+          qt: 5
+        - name: Qt 5 / macOS arm64
           os: macos-latest
           container:
           qt: 5
@@ -53,6 +57,10 @@ jobs:
           container: { image: "ubuntu:22.04", options: --privileged }
           qt: 6
         - name: Qt 6 / macOS x86_64
+          os: macos-12
+          container:
+          qt: 6
+        - name: Qt 6 / macOS arm64
           os: macos-latest
           container:
           qt: 6

From 5bc846be365497207598d82cee998bfcae42bffe Mon Sep 17 00:00:00 2001
From: Oliver Stevns <1045397+MrStevns@users.noreply.github.com>
Date: Sat, 27 Apr 2024 09:29:39 +0200
Subject: [PATCH 2/2] Update .github/actions/create-package/create-package.sh

Co-authored-by: Jakob <j5lx@fmail.co.uk>
---
 .github/actions/create-package/create-package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/create-package/create-package.sh b/.github/actions/create-package/create-package.sh
index 3b1931c86d..e3964960e8 100755
--- a/.github/actions/create-package/create-package.sh
+++ b/.github/actions/create-package/create-package.sh
@@ -99,8 +99,8 @@ create_package_macos() {
   echo "Create ZIP"
   local qtsuffix="-qt${INPUT_QT}"
   local arch=`uname -m`
-  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-${arch}.zip" Pencil2D
-  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}" > "${GITHUB_OUTPUT}"
+  bsdtar caf "pencil2d${qtsuffix/-qt5/}-mac-${arch}-$3.zip" Pencil2D
+  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}-$3" > "${GITHUB_OUTPUT}"
 }
 
 create_package_windows() {