From 8c025d0b960c13a8542347743e68465881fa2ebd Mon Sep 17 00:00:00 2001 From: borgvin Date: Thu, 2 May 2024 10:35:44 +0100 Subject: [PATCH 1/2] run mac builds on macos-13 (x86) instead of macos-latest (M1) --- .github/workflows/desktop.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/desktop.build.yml b/.github/workflows/desktop.build.yml index 29ddd95f..85130a8a 100644 --- a/.github/workflows/desktop.build.yml +++ b/.github/workflows/desktop.build.yml @@ -21,7 +21,7 @@ jobs: system: - os: "windows-latest" path: "squirrel.windows/x64/" - - os: "macOS-latest" + - os: "macos-13" path: "" - os: ubuntu-latest path: "deb/x64/" From 6f0f14de3a580abcb1064313ddfa0a371ebdbf40 Mon Sep 17 00:00:00 2001 From: borgvin Date: Thu, 2 May 2024 12:04:18 +0100 Subject: [PATCH 2/2] fix make script for M1 --- sh/make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sh/make.sh b/sh/make.sh index 932dbd55..23d54870 100755 --- a/sh/make.sh +++ b/sh/make.sh @@ -4,7 +4,7 @@ export HAVEN_DESKTOP_DEVELOPMENT=false export NODE_INSTALLER=npm -if [ "$ACTION_OS" == "macOS-latest" ] +if [ "$ACTION_OS" == "macos-13" ] then npm run make --prefix haven-desktop-app -- --arch="arm64,x64" else