diff --git a/.github/workflows/build-for-pr.yml b/.github/workflows/build-for-pr.yml index abdcd6ca61e..2d5796d3e42 100644 --- a/.github/workflows/build-for-pr.yml +++ b/.github/workflows/build-for-pr.yml @@ -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 @@ -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: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8d27ac3b9ff..c898f6fbfdf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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 diff --git a/.github/workflows/nightly-builds.yaml b/.github/workflows/nightly-builds.yaml index 1b5010745d9..9d3d6ebb05f 100644 --- a/.github/workflows/nightly-builds.yaml +++ b/.github/workflows/nightly-builds.yaml @@ -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 diff --git a/.github/workflows/nightly-main.yml b/.github/workflows/nightly-main.yml index 41783c118b7..afa85fab9cb 100644 --- a/.github/workflows/nightly-main.yml +++ b/.github/workflows/nightly-main.yml @@ -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 }} @@ -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 @@ -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: @@ -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 diff --git a/.github/workflows/nightly-rainforest.yml b/.github/workflows/nightly-rainforest.yml index db7be574bc1..3c89a997767 100644 --- a/.github/workflows/nightly-rainforest.yml +++ b/.github/workflows/nightly-rainforest.yml @@ -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 @@ -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 diff --git a/.github/workflows/release-mas.yaml b/.github/workflows/release-mas.yaml index 71005d8dcd3..a5eb14f73d1 100644 --- a/.github/workflows/release-mas.yaml +++ b/.github/workflows/release-mas.yaml @@ -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 }} @@ -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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fd7bc806b09..30b19b63278 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -119,7 +119,7 @@ jobs: retention-days: 14 build-mac-installer: - runs-on: macos-12 + runs-on: macos-15 needs: - begin-notification steps: @@ -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