Skip to content

Commit

Permalink
fix: Run with macos-13
Browse files Browse the repository at this point in the history
  • Loading branch information
marc2332 committed Aug 18, 2023
1 parent 789dc83 commit 43a86ac
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
needs: [setup]
strategy:
matrix:
os: [ubuntu-20.04, macos-11, windows-latest]
os: [ubuntu-20.04, macos-13, windows-latest]
fail-fast: false
env:
VERSION: ${{ needs.setup.outputs.version }}
Expand All @@ -67,7 +67,7 @@ jobs:

- name: Select Xcode
uses: maxim-lobanov/setup-xcode@v1
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'
with:
xcode-version: 'latest-stable'

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

- name: Set deployment target (macOS)
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'

- name: Install required packages (Linux)
run: |
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
- name: Install Sentry CLI
# Yarn has issues putting binaries in the PATH on Windows
run: npm i -g @sentry/cli
if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-11' }}
if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-13' }}

# - name: Strip backend debug info and upload to Sentry (Linux)
# run: |
Expand Down Expand Up @@ -190,13 +190,13 @@ jobs:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

- name: Set up Python 2.x (macOS)
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'
run: |
wget https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg -O ${{ runner.temp }}/python.pkg
sudo installer -pkg ${{ runner.temp }}/python.pkg -target / -verbose
- name: Test Python 2.x (macOS)
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'
run: |
which python2
python2 --version
Expand All @@ -209,7 +209,7 @@ jobs:
FIREFLY_APPLE_ID: ${{ secrets.APPLE_ID }}
FIREFLY_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
working-directory: packages/desktop
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'

- name: Build Electron app (Windows)
run: yarn compile:${env:STAGE}:win
Expand Down Expand Up @@ -248,7 +248,7 @@ jobs:
- name: Compute checksums (macOS)
run: for i in `ls | grep 'firefly-desktop*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
working-directory: packages/desktop/out
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-13'

- name: Compute checksums (Windows)
run: Get-ChildItem "." -Filter firefly-desktop* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
- name: Downloading artifacts
uses: actions/download-artifact@v2
with:
name: firefly-desktop-macos-11
name: firefly-desktop-macos-13
path: assets

- name: Downloading artifacts
Expand Down

0 comments on commit 43a86ac

Please sign in to comment.