diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e55a98c4..1b04c397 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest, windows-11-arm, macos-latest] + os: [ubuntu-latest, macos-15-intel, windows-latest, windows-11-arm, macos-latest] steps: @@ -31,7 +31,7 @@ jobs: # step2: sign - name: Install the Apple certificates - if: matrix.os == 'macos-13' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' run: | CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH @@ -49,7 +49,7 @@ jobs: # step3: yarn - name: Install dependencies (macOS) - if: matrix.os == 'macos-13' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' run: | yarn config set ignore-engines true yarn @@ -86,7 +86,7 @@ jobs: $config | ConvertTo-Json -Depth 10 | Set-Content electron-builder.json - name: Modify electron-builder.json for Macos x64 - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' run: | # Remove arm64 from the arch array, keep only x64 jq '.mac.target[0].arch = ["x64"]' electron-builder.json > tmp.json && mv tmp.json electron-builder.json @@ -163,7 +163,7 @@ jobs: if-no-files-found: error - name: Upload macOS x64 packages - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' uses: actions/upload-artifact@v4 with: name: macos-x64-packages @@ -213,7 +213,7 @@ jobs: if-no-files-found: error - name: Upload macOS x64 yml - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' uses: actions/upload-artifact@v4 with: name: macos-x64-yml diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 7dd3434e..f9d7adb1 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-13, windows-latest, windows-11-arm, macos-latest] + os: [ubuntu-latest, macos-15-intel, windows-latest, windows-11-arm, macos-latest] steps: - name: Set up git config @@ -40,7 +40,7 @@ jobs: sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils - name: Install dependencies (macOS) - if: matrix.os == 'macos-13' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' run: | yarn config set ignore-engines true yarn install @@ -74,7 +74,7 @@ jobs: $config | ConvertTo-Json -Depth 10 | Set-Content electron-builder.json - name: Modify electron-builder.json for Macos x64 - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' run: | # Remove arm64 from the arch array, keep only x64 jq '.mac.target[0].arch = ["x64"]' electron-builder.json > tmp.json && mv tmp.json electron-builder.json @@ -94,7 +94,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} - name: Build application (macOS) - if: matrix.os == 'macos-13' || matrix.os == 'macos-latest' + if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-latest' run: yarn build:mac env: ELECTRON_SKIP_NOTARIZATION: true @@ -131,7 +131,7 @@ jobs: if-no-files-found: error - name: Upload macOS packages - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' uses: actions/upload-artifact@v4 with: name: macos-x64-packages @@ -181,7 +181,7 @@ jobs: if-no-files-found: error - name: Upload macOS yml - if: matrix.os == 'macos-13' + if: matrix.os == 'macos-15-intel' uses: actions/upload-artifact@v4 with: name: macos-x64-yml