From 07697bfa995794fcda9271ee834b7730562b9107 Mon Sep 17 00:00:00 2001
From: Ben van Hartingsveldt <ben.vanhartingsveldt@yocto.com>
Date: Tue, 16 Sep 2025 18:18:25 +0200
Subject: [PATCH] Upgrade MacOS and Xcode

---
 .github/workflows/deploy.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3d05b90e6..9345d36ff 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,7 +24,7 @@ jobs:
         node-version: [16.x]
         os:
           - ubuntu-latest
-          - macos-13
+          - macos-latest
           - windows-latest
     runs-on: ${{ matrix.os }}
     continue-on-error: true
@@ -38,15 +38,24 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         if: startsWith(runner.os, 'mac')
         with:
-          xcode-version: '15.2.0'
+          xcode-version: '16.0.0'
+      # This is gonna be hacky.
+      # Github made us upgrade xcode, which would force an upgrade of electron-builder to fix mac.
+      # But there were bugs with copyfiles / extraFiles that kept seeing duplicates erroring on ln.
+      # A flag USE_HARD_LINKS=false in electron-builder.json was suggested in comments, but that broke windows builds.
+      # So for now we'll install python2 on mac and make sure it can find it.
+      # Remove this after successfully upgrading electron-builder.
+      # HACK part 1
       - uses: Homebrew/actions/setup-homebrew@master
         if: startsWith(runner.os, 'mac')
+      # HACK part 2
       - name: Install Python2
         if: startsWith(runner.os, 'mac')
         run: |
           brew install pyenv
           pyenv install 2.7
           pyenv global 2.7
+          export PATH="$(pyenv root)/shims:${PATH}"
       - name: Download blockchain headers
         run: |
           mkdir -p ./static/daemon