Skip to content

Commit 07697bf

Browse files
committed
Upgrade MacOS and Xcode
1 parent 84612a9 commit 07697bf

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.github/workflows/deploy.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
node-version: [16.x]
2525
os:
2626
- ubuntu-latest
27-
- macos-13
27+
- macos-latest
2828
- windows-latest
2929
runs-on: ${{ matrix.os }}
3030
continue-on-error: true
@@ -38,15 +38,24 @@ jobs:
3838
- uses: maxim-lobanov/setup-xcode@v1
3939
if: startsWith(runner.os, 'mac')
4040
with:
41-
xcode-version: '15.2.0'
41+
xcode-version: '16.0.0'
42+
# This is gonna be hacky.
43+
# Github made us upgrade xcode, which would force an upgrade of electron-builder to fix mac.
44+
# But there were bugs with copyfiles / extraFiles that kept seeing duplicates erroring on ln.
45+
# A flag USE_HARD_LINKS=false in electron-builder.json was suggested in comments, but that broke windows builds.
46+
# So for now we'll install python2 on mac and make sure it can find it.
47+
# Remove this after successfully upgrading electron-builder.
48+
# HACK part 1
4249
- uses: Homebrew/actions/setup-homebrew@master
4350
if: startsWith(runner.os, 'mac')
51+
# HACK part 2
4452
- name: Install Python2
4553
if: startsWith(runner.os, 'mac')
4654
run: |
4755
brew install pyenv
4856
pyenv install 2.7
4957
pyenv global 2.7
58+
export PATH="$(pyenv root)/shims:${PATH}"
5059
- name: Download blockchain headers
5160
run: |
5261
mkdir -p ./static/daemon

0 commit comments

Comments
 (0)