Skip to content

Commit

Permalink
Update build environment for GitHub Actions from macOS 12 to 15 (#3226)
Browse files Browse the repository at this point in the history
* Update build environment for GitHub Actions from macOS 12 to 15

* Fix node issue

* Add fix to other workflows
  • Loading branch information
devinbinnie authored Nov 25, 2024
1 parent 513a7e0 commit 8098635
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-for-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
retention-days: 10 ## No need to keep CI builds more than 10 days

build-mac-for-pr:
runs-on: macos-12
runs-on: macos-15
if: ${{ github.event.label.name == 'Build Apps for PR' }}
steps:
- name: ci/checkout-repo
Expand All @@ -158,6 +158,7 @@ jobs:
run: |
brew install yq
jq '.mac.target=["zip"]' electron-builder.json | jq '.mac.gatekeeperAssess=false' > /tmp/electron-builder.json && cp /tmp/electron-builder.json .
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: ci/build
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
retention-days: 10 ## No need to keep CI builds more than 10 days

build-mac-no-dmg:
runs-on: macos-12
runs-on: macos-15
steps:
- name: ci/checkout-repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -158,6 +158,7 @@ jobs:
run: |
brew install yq
jq '.mac.target=["zip"]' electron-builder.json | jq '.mac.gatekeeperAssess=false' > /tmp/electron-builder.json && cp /tmp/electron-builder.json .
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: ci/test
uses: ./.github/actions/test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
runs-on:
- macos-13
- macos-15
- ubuntu-22.04
- windows-2022
uses: ./.github/workflows/e2e-functional-template.yml
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nightly-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
retention-days: 5 ## No need to keep them since they are uploaded on S3

mac-app-store-preflight:
runs-on: macos-12
runs-on: macos-15
env:
MAS_PROFILE: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MAS_PROFILE }}
MACOS_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
Expand All @@ -129,6 +129,7 @@ jobs:
- name: nightly/install-dependencies
run: |
brew install yq
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: nightly/copy-provisioning-profile
run: echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile
Expand All @@ -142,7 +143,7 @@ jobs:
run: fastlane publish_test path:"$(find . -name \*.pkg -print -quit)"

build-mac-installer:
runs-on: macos-12
runs-on: macos-15
needs:
- mac-app-store-preflight
steps:
Expand All @@ -159,6 +160,7 @@ jobs:
- name: nightly/install-dependencies
run: |
brew install yq rename
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: nightly/test
uses: ./.github/actions/test
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly-rainforest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
retention-days: 5 ## No need to keep them since they are uploaded on S3

build-mac-installer:
runs-on: macos-12
runs-on: macos-15
steps:
- name: nightly/checkout-repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -88,6 +88,7 @@ jobs:
- name: nightly/install-dependencies
run: |
brew install yq rename
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: nightly/test
uses: ./.github/actions/test
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-mas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
mac-app-store-preflight:
runs-on: macos-12
runs-on: macos-15
env:
MAS_PROFILE: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MAS_PROFILE }}
MACOS_API_KEY_ID: ${{ secrets.MM_DESKTOP_MAC_APP_STORE_MACOS_API_KEY_ID }}
Expand All @@ -36,6 +36,7 @@ jobs:
- name: release/install-dependencies
run: |
brew install yq
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: release/copy-provisioning-profile
run: echo $MAS_PROFILE | base64 -D > ./mas.provisionprofile
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
retention-days: 14

build-mac-installer:
runs-on: macos-12
runs-on: macos-15
needs:
- begin-notification
steps:
Expand All @@ -136,6 +136,7 @@ jobs:
- name: release/install-dependencies
run: |
brew install yq rename
sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
npm ci
- name: release/test
uses: ./.github/actions/test
Expand Down

0 comments on commit 8098635

Please sign in to comment.