Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: desktop 1.7.3 #7321

Merged
merged 3 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 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 @@ -60,11 +60,16 @@ jobs:
with:
node-version: 14.x

- name: Set up Python 2.x (macOS)
uses: actions/setup-python@v2
if: matrix.os == 'macos-11'
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'

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

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -106,10 +111,6 @@ jobs:
working-directory: packages/backend/bindings/node/native
if: matrix.os == 'windows-latest'

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

- name: Install required packages (Linux)
run: |
sudo apt update
Expand All @@ -136,12 +137,11 @@ jobs:
env:
SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_BACKEND }}
SENTRY_ENVIRONMENT: ${{ env.STAGE }}
NODE_GYP_FORCE_PYTHON: '2.7.18'

- 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 @@ -181,6 +181,18 @@ jobs:
SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

- name: Set up Python 2.x (macOS)
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-13'
run: |
which python2
python2 --version

- name: Build Electron app (macOS)
run: yarn compile:${STAGE}:mac
env:
Expand All @@ -189,7 +201,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 @@ -228,7 +240,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 @@ -267,7 +279,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 Expand Up @@ -367,4 +379,4 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: eu-central-1
AWS_DEFAULT_REGION: eu-central-1
Loading
Loading