Fix build server only deploys arm64 macOS binaries (#1835)

* Fix build server only deploys arm64 macOS binaries By introducing another runner, we can deploy arm64 and intel separately * Update .github/actions/create-package/create-package.sh Co-authored-by: Jakob <j5lx@fmail.co.uk>
pencil2d · May 2, 2024 · 43351a5 · 43351a5
1 parent 64d3e5b
commit 43351a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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}-$3.zip" Pencil2D
+  echo "output-basename=pencil2d${qtsuffix/-qt5/}-mac-${arch}-$3" > "${GITHUB_OUTPUT}"
 }
 
 create_package_windows() {

diff --git 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