Skip to content

Commit

Permalink
chore: replace macos-11 with macos-12
Browse files Browse the repository at this point in the history
  • Loading branch information
begonaalvarezd committed Jun 24, 2024
1 parent ed6e157 commit 898ca6d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-release-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
needs: [setup]
strategy:
matrix:
os: [ubuntu-20.04, macos-11, windows-2019]
os: [ubuntu-20.04, macos-12, windows-2019]
fail-fast: true
env:
VERSION: ${{ needs.setup.outputs.version }}
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

- name: Set deployment target (macOS)
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Install required packages (Linux)
run: |
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
working-directory: packages/desktop
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Build Electron app (Windows)
run: yarn compile:${env:STAGE}:win
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Compute checksums (macOS)
run: for i in `ls | grep 'firefly-*'` ; 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-12'

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

- name: Downloading artifacts
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-desktop-test.v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: ${{ always() }}
strategy:
matrix:
os: [ubuntu-18.04, macos-11, windows-2019]
os: [ubuntu-18.04, macos-12, windows-2019]
fail-fast: true
env:
VERSION: '1.7.2-test'
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:

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

- name: Install required packages (Linux)
run: |
Expand Down Expand Up @@ -83,7 +83,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-12' }}

# - name: Strip backend debug info and upload to Sentry (Linux)
# run: |
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
working-directory: packages/desktop
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Build Electron app (Windows)
run: yarn compile:${env:STAGE}:win
Expand Down Expand Up @@ -170,7 +170,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-12'

- 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
6 changes: 3 additions & 3 deletions .github/workflows/build-desktop-test.v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: ${{ always() }}
strategy:
matrix:
os: [ ubuntu-20.04, macos-11, windows-2019 ]
os: [ ubuntu-20.04, macos-12, windows-2019 ]
fail-fast: true
env:
VERSION: '2.1.3-test'
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:

- name: Set deployment target (macOS)
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Install required packages (Linux)
run: |
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
working-directory: packages/desktop
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Build Electron app (Windows)
run: yarn compile:${env:STAGE}:win
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
required: true
type: choice
options:
- macos-11
- macos-12
- ubuntu-20.04
- windows-2019
stage:
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:

- name: Set deployment target (macOS)
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Install required packages (Linux)
run: |
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
working-directory: packages/desktop
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'

- name: Build Electron app (Windows)
run: yarn compile:${env:STAGE}:win
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
- name: Compute checksums (macOS)
run: for i in `ls | grep 'firefly-*'` ; 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-12'

- name: Compute checksums (Windows)
run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
Expand Down

0 comments on commit 898ca6d

Please sign in to comment.