From e0964b7c58b4e4302b47866ff9d29ebbf750902c Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 18 Dec 2025 08:13:22 +0530 Subject: [PATCH 1/3] ci: pro build creds in github actions --- .github/workflows/desktop-linux-test-pull.yml | 4 ++++ .github/workflows/desktop-mac-m1-test-pull.yml | 4 ++++ .github/workflows/desktop-mac-test-pull.yml | 4 ++++ .github/workflows/desktop-windows-test-pull.yml | 4 ++++ .github/workflows/prod-desktop-tests-on-pull.yml | 14 ++++++++++++++ .../workflows/staging-desktop-tests-on-pull.yml | 16 ++++++++++++++++ .github/workflows/tauri-build-dev.yml | 10 ++++++++++ .github/workflows/tauri-build-prod.yml | 14 ++++++++++++++ .github/workflows/tauri-build-staging.yml | 12 ++++++++++++ 9 files changed, 82 insertions(+) diff --git a/.github/workflows/desktop-linux-test-pull.yml b/.github/workflows/desktop-linux-test-pull.yml index 0b7c0d0..0cd9d29 100644 --- a/.github/workflows/desktop-linux-test-pull.yml +++ b/.github/workflows/desktop-linux-test-pull.yml @@ -37,6 +37,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -48,6 +50,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/desktop-mac-m1-test-pull.yml b/.github/workflows/desktop-mac-m1-test-pull.yml index 25348a6..cbf7ee7 100644 --- a/.github/workflows/desktop-mac-m1-test-pull.yml +++ b/.github/workflows/desktop-mac-m1-test-pull.yml @@ -32,6 +32,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -43,6 +45,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/desktop-mac-test-pull.yml b/.github/workflows/desktop-mac-test-pull.yml index 6513fac..38c95e9 100644 --- a/.github/workflows/desktop-mac-test-pull.yml +++ b/.github/workflows/desktop-mac-test-pull.yml @@ -30,6 +30,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -41,6 +43,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/desktop-windows-test-pull.yml b/.github/workflows/desktop-windows-test-pull.yml index d712521..fc64198 100644 --- a/.github/workflows/desktop-windows-test-pull.yml +++ b/.github/workflows/desktop-windows-test-pull.yml @@ -30,6 +30,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -41,6 +43,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/prod-desktop-tests-on-pull.yml b/.github/workflows/prod-desktop-tests-on-pull.yml index e90c0a8..568dae6 100644 --- a/.github/workflows/prod-desktop-tests-on-pull.yml +++ b/.github/workflows/prod-desktop-tests-on-pull.yml @@ -35,6 +35,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -44,6 +46,10 @@ jobs: npm run release:prod - name: build test runner + env: + GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug @@ -105,6 +111,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -116,6 +124,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug @@ -177,6 +187,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -188,6 +200,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/staging-desktop-tests-on-pull.yml b/.github/workflows/staging-desktop-tests-on-pull.yml index ee1f4b1..69f77a5 100644 --- a/.github/workflows/staging-desktop-tests-on-pull.yml +++ b/.github/workflows/staging-desktop-tests-on-pull.yml @@ -35,6 +35,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -46,6 +48,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug @@ -100,6 +104,8 @@ jobs: - name: Download phoenix and build build phoenix dist-test env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -109,6 +115,10 @@ jobs: npm run release:staging - name: build test runner + env: + GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug @@ -161,6 +171,10 @@ jobs: run: npm ci - name: Download phoenix and build build phoenix dist-test + env: + GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm run _ci-clonePhoenixForTests cd .. @@ -172,6 +186,8 @@ jobs: - name: build test runner env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run releaseDistTestDebug diff --git a/.github/workflows/tauri-build-dev.yml b/.github/workflows/tauri-build-dev.yml index 5233e1b..2218e3c 100644 --- a/.github/workflows/tauri-build-dev.yml +++ b/.github/workflows/tauri-build-dev.yml @@ -55,6 +55,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-cloneAndBuildPhoenix @@ -105,6 +107,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:dev @@ -225,6 +229,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} updaterJsonPreferNsis: true @@ -259,6 +265,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} args: --target aarch64-apple-darwin @@ -302,6 +310,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:dev diff --git a/.github/workflows/tauri-build-prod.yml b/.github/workflows/tauri-build-prod.yml index 349f8ae..9e8a95b 100644 --- a/.github/workflows/tauri-build-prod.yml +++ b/.github/workflows/tauri-build-prod.yml @@ -55,6 +55,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-cloneAndBuildPhoenix @@ -105,6 +107,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:prod @@ -229,6 +233,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} updaterJsonPreferNsis: true @@ -250,6 +256,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} updaterJsonPreferNsis: true @@ -270,6 +278,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} updaterJsonPreferNsis: true @@ -304,6 +314,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} args: --target aarch64-apple-darwin @@ -346,6 +358,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:prod diff --git a/.github/workflows/tauri-build-staging.yml b/.github/workflows/tauri-build-staging.yml index e08c58b..862e14c 100644 --- a/.github/workflows/tauri-build-staging.yml +++ b/.github/workflows/tauri-build-staging.yml @@ -55,6 +55,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-cloneAndBuildPhoenix @@ -103,6 +105,10 @@ jobs: with: toolchain: 1.85.1 - name: install frontend dependencies + env: + GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:staging @@ -223,6 +229,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} updaterJsonPreferNsis: true @@ -257,6 +265,8 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} with: releaseId: ${{ needs.create-release.outputs.release_id }} args: --target aarch64-apple-darwin @@ -299,6 +309,8 @@ jobs: - name: install frontend dependencies env: GH_TOKEN: ${{ github.token }} + PRO_REPO_URL: ${{ secrets.PRO_REPO_URL }} + PRO_REPO_ACCESS_TOKEN: ${{ secrets.PRO_REPO_ACCESS_TOKEN }} run: | npm ci npm run _ci-release:staging From f7ad468c81f4fbe65b6ac2ecf755b1fb34eff77d Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 18 Dec 2025 08:21:59 +0530 Subject: [PATCH 2/3] ci: move all github action runners to macos 15 as mac 13 is depecated in actions --- .github/workflows/desktop-mac-m1-test-pull.yml | 2 +- .github/workflows/desktop-mac-test-pull.yml | 2 +- .github/workflows/prod-desktop-tests-on-pull.yml | 2 +- .../workflows/staging-desktop-tests-on-pull.yml | 2 +- .github/workflows/tauri-build-dev.yml | 16 ++++++++-------- .github/workflows/tauri-build-prod.yml | 16 ++++++++-------- .github/workflows/tauri-build-staging.yml | 16 ++++++++-------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/desktop-mac-m1-test-pull.yml b/.github/workflows/desktop-mac-m1-test-pull.yml index cbf7ee7..7d77ed1 100644 --- a/.github/workflows/desktop-mac-m1-test-pull.yml +++ b/.github/workflows/desktop-mac-m1-test-pull.yml @@ -9,7 +9,7 @@ concurrency: jobs: test-desktop-mac-m1: - runs-on: macos-14 + runs-on: macos-15 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/desktop-mac-test-pull.yml b/.github/workflows/desktop-mac-test-pull.yml index 38c95e9..340c6ce 100644 --- a/.github/workflows/desktop-mac-test-pull.yml +++ b/.github/workflows/desktop-mac-test-pull.yml @@ -9,7 +9,7 @@ concurrency: jobs: test-desktop-mac: - runs-on: macos-13 + runs-on: macos-15-intel timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/prod-desktop-tests-on-pull.yml b/.github/workflows/prod-desktop-tests-on-pull.yml index 568dae6..3cdefaf 100644 --- a/.github/workflows/prod-desktop-tests-on-pull.yml +++ b/.github/workflows/prod-desktop-tests-on-pull.yml @@ -90,7 +90,7 @@ jobs: command: xvfb-run ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q testDesktopMac: - runs-on: macos-latest + runs-on: macos-15 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/staging-desktop-tests-on-pull.yml b/.github/workflows/staging-desktop-tests-on-pull.yml index 69f77a5..5cd743b 100644 --- a/.github/workflows/staging-desktop-tests-on-pull.yml +++ b/.github/workflows/staging-desktop-tests-on-pull.yml @@ -83,7 +83,7 @@ jobs: command: xvfb-run ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q testDesktopMac: - runs-on: macos-latest + runs-on: macos-15 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tauri-build-dev.yml b/.github/workflows/tauri-build-dev.yml index 2218e3c..d9a1e48 100644 --- a/.github/workflows/tauri-build-dev.yml +++ b/.github/workflows/tauri-build-dev.yml @@ -43,7 +43,7 @@ jobs: permissions: contents: write timeout-minutes: 15 - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 - name: macos hardware info @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ macos-13, windows-latest ] + platform: [ macos-15-intel, windows-latest ] runs-on: ${{ matrix.platform }} steps: @@ -94,7 +94,7 @@ jobs: node-version: 20 - name: Download src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: actions/download-artifact@v4 with: name: src-node-darwin-arm64.tar.gz @@ -114,7 +114,7 @@ jobs: npm run _ci-release:dev - name: setup src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls /tmp/src-node-darwin-arm64.tar.gz rm -rf src-node @@ -167,7 +167,7 @@ jobs: Set-Content -Path "./secrets.json" -Value $content shell: powershell - name: Sign embedded executables for (Mac Only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' env : APPLE_KEY_IDENTITY_NAME: ${{ secrets.APPLE_KEY_IDENTITY_NAME }} APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} @@ -237,7 +237,7 @@ jobs: tagName: ${{ env.GIT_TAG_NAME }} - name: inject src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls src-node rm -rf src-tauri/src-node @@ -247,12 +247,12 @@ jobs: - name: setup env for mac arm (Mac only) env: GH_TOKEN: ${{ github.token }} - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | rustup target add aarch64-apple-darwin npm run installNodeArmDarwin - name: build for mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/tauri-build-prod.yml b/.github/workflows/tauri-build-prod.yml index 9e8a95b..0ee9c99 100644 --- a/.github/workflows/tauri-build-prod.yml +++ b/.github/workflows/tauri-build-prod.yml @@ -43,7 +43,7 @@ jobs: permissions: contents: write timeout-minutes: 15 - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 - name: macos hardware info @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ macos-13, windows-latest ] + platform: [ macos-15-intel, windows-latest ] runs-on: ${{ matrix.platform }} steps: @@ -94,7 +94,7 @@ jobs: node-version: 20 - name: Download src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: actions/download-artifact@v4 with: name: src-node-darwin-arm64.tar.gz @@ -114,7 +114,7 @@ jobs: npm run _ci-release:prod - name: setup src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls /tmp/src-node-darwin-arm64.tar.gz rm -rf src-node @@ -168,7 +168,7 @@ jobs: shell: powershell - name: Sign embedded executables for (Mac Only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' env : APPLE_KEY_IDENTITY_NAME: ${{ secrets.APPLE_KEY_IDENTITY_NAME }} APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} @@ -286,7 +286,7 @@ jobs: tagName: ${{ env.GIT_TAG_NAME }} - name: inject src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls src-node rm -rf src-tauri/src-node @@ -296,12 +296,12 @@ jobs: - name: setup env for mac arm (Mac only) env: GH_TOKEN: ${{ github.token }} - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | rustup target add aarch64-apple-darwin npm run installNodeArmDarwin - name: build for mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/tauri-build-staging.yml b/.github/workflows/tauri-build-staging.yml index 862e14c..ad7aff0 100644 --- a/.github/workflows/tauri-build-staging.yml +++ b/.github/workflows/tauri-build-staging.yml @@ -43,7 +43,7 @@ jobs: permissions: contents: write timeout-minutes: 15 - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 - name: macos hardware info @@ -80,7 +80,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ macos-13, windows-latest ] + platform: [ macos-15-intel, windows-latest ] runs-on: ${{ matrix.platform }} steps: @@ -94,7 +94,7 @@ jobs: node-version: 20 - name: Download src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: actions/download-artifact@v4 with: name: src-node-darwin-arm64.tar.gz @@ -114,7 +114,7 @@ jobs: npm run _ci-release:staging - name: setup src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls /tmp/src-node-darwin-arm64.tar.gz rm -rf src-node @@ -167,7 +167,7 @@ jobs: Set-Content -Path "./secrets.json" -Value $content shell: powershell - name: Sign embedded executables for (Mac Only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' env : APPLE_KEY_IDENTITY_NAME: ${{ secrets.APPLE_KEY_IDENTITY_NAME }} APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} @@ -237,7 +237,7 @@ jobs: tagName: ${{ env.GIT_TAG_NAME }} - name: inject src-node built on mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | ls src-node rm -rf src-tauri/src-node @@ -247,12 +247,12 @@ jobs: - name: setup env for mac arm (Mac only) env: GH_TOKEN: ${{ github.token }} - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' run: | rustup target add aarch64-apple-darwin npm run installNodeArmDarwin - name: build for mac arm (Mac only) - if: matrix.platform == 'macos-13' + if: matrix.platform == 'macos-15-intel' uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ github.token }} From a5b592d6fc6c2d7d404a79836557a8c08c0522c9 Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 18 Dec 2025 12:19:58 +0530 Subject: [PATCH 3/3] ci: run tests even after failure of one sute for other suites to complete --- .github/workflows/desktop-linux-test-pull.yml | 32 ++++++++++ .../workflows/desktop-mac-m1-test-pull.yml | 32 ++++++++++ .github/workflows/desktop-mac-test-pull.yml | 32 ++++++++++ .../workflows/prod-desktop-tests-on-pull.yml | 64 +++++++++++++++++++ .../staging-desktop-tests-on-pull.yml | 54 ++++++++++++++++ 5 files changed, 214 insertions(+) diff --git a/.github/workflows/desktop-linux-test-pull.yml b/.github/workflows/desktop-linux-test-pull.yml index 0cd9d29..dad96d7 100644 --- a/.github/workflows/desktop-linux-test-pull.yml +++ b/.github/workflows/desktop-linux-test-pull.yml @@ -58,6 +58,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: linuxRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -65,6 +67,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: linuxRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -72,6 +76,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: linuxRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -79,6 +85,8 @@ jobs: - name: Run tauri livepreview tests uses: nick-fields/retry@v3 + id: linuxRunLivepreview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -86,7 +94,31 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: linuxRunLegacyInteg + continue-on-error: true with: timeout_minutes: 20 max_attempts: 3 command: xvfb-run ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + + - name: Fail on test runs failed in Linux + if: steps.linuxRunUnit.outcome == 'failure' || steps.linuxRunIntegration.outcome == 'failure' || steps.linuxRunMainview.outcome == 'failure' || steps.linuxRunLivepreview.outcome == 'failure' || steps.linuxRunLegacyInteg.outcome == 'failure' + run: | + echo "Linux tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.linuxRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.linuxRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.linuxRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.linuxRunLivepreview.outcome }}" == "failure" ]; then + echo "- Run tauri livepreview tests" + fi + if [ "${{ steps.linuxRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 diff --git a/.github/workflows/desktop-mac-m1-test-pull.yml b/.github/workflows/desktop-mac-m1-test-pull.yml index 7d77ed1..e24527b 100644 --- a/.github/workflows/desktop-mac-m1-test-pull.yml +++ b/.github/workflows/desktop-mac-m1-test-pull.yml @@ -53,6 +53,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: macM1RunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -60,6 +62,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: macM1RunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -67,6 +71,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: macM1RunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -74,6 +80,8 @@ jobs: - name: Run tauri livepreview tests uses: nick-fields/retry@v3 + id: macM1RunLivepreview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -81,7 +89,31 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: macM1RunLegacyInteg + continue-on-error: true with: timeout_minutes: 30 max_attempts: 3 command: ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + + - name: Fail on test runs failed in Mac M1 + if: steps.macM1RunUnit.outcome == 'failure' || steps.macM1RunIntegration.outcome == 'failure' || steps.macM1RunMainview.outcome == 'failure' || steps.macM1RunLivepreview.outcome == 'failure' || steps.macM1RunLegacyInteg.outcome == 'failure' + run: | + echo "Mac M1 tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.macM1RunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.macM1RunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.macM1RunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.macM1RunLivepreview.outcome }}" == "failure" ]; then + echo "- Run tauri livepreview tests" + fi + if [ "${{ steps.macM1RunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 diff --git a/.github/workflows/desktop-mac-test-pull.yml b/.github/workflows/desktop-mac-test-pull.yml index 340c6ce..4cbbe2f 100644 --- a/.github/workflows/desktop-mac-test-pull.yml +++ b/.github/workflows/desktop-mac-test-pull.yml @@ -51,6 +51,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: macRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -58,6 +60,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: macRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -65,6 +69,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: macRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -72,6 +78,8 @@ jobs: - name: Run tauri livepreview tests uses: nick-fields/retry@v3 + id: macRunLivepreview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -79,7 +87,31 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: macRunLegacyInteg + continue-on-error: true with: timeout_minutes: 30 max_attempts: 3 command: ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + + - name: Fail on test runs failed in Mac + if: steps.macRunUnit.outcome == 'failure' || steps.macRunIntegration.outcome == 'failure' || steps.macRunMainview.outcome == 'failure' || steps.macRunLivepreview.outcome == 'failure' || steps.macRunLegacyInteg.outcome == 'failure' + run: | + echo "Mac tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.macRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.macRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.macRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.macRunLivepreview.outcome }}" == "failure" ]; then + echo "- Run tauri livepreview tests" + fi + if [ "${{ steps.macRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 diff --git a/.github/workflows/prod-desktop-tests-on-pull.yml b/.github/workflows/prod-desktop-tests-on-pull.yml index 3cdefaf..d36b3a7 100644 --- a/.github/workflows/prod-desktop-tests-on-pull.yml +++ b/.github/workflows/prod-desktop-tests-on-pull.yml @@ -56,6 +56,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: linuxRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -63,6 +65,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: linuxRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -70,6 +74,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: linuxRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -77,6 +83,8 @@ jobs: - name: Run tauri livepreview tests uses: nick-fields/retry@v3 + id: linuxRunLivepreview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -84,11 +92,35 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: linuxRunLegacyInteg + continue-on-error: true with: timeout_minutes: 20 max_attempts: 3 command: xvfb-run ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + - name: Fail on test runs failed in Linux (prod) + if: steps.linuxRunUnit.outcome == 'failure' || steps.linuxRunIntegration.outcome == 'failure' || steps.linuxRunMainview.outcome == 'failure' || steps.linuxRunLivepreview.outcome == 'failure' || steps.linuxRunLegacyInteg.outcome == 'failure' + run: | + echo "Linux (prod) tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.linuxRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.linuxRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.linuxRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.linuxRunLivepreview.outcome }}" == "failure" ]; then + echo "- Run tauri livepreview tests" + fi + if [ "${{ steps.linuxRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 + testDesktopMac: runs-on: macos-15 timeout-minutes: 90 @@ -132,6 +164,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: macRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -139,6 +173,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: macRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -146,6 +182,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: macRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -153,6 +191,8 @@ jobs: - name: Run tauri livepreview tests uses: nick-fields/retry@v3 + id: macRunLivepreview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -160,11 +200,35 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: macRunLegacyInteg + continue-on-error: true with: timeout_minutes: 30 max_attempts: 3 command: ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + - name: Fail on test runs failed in Mac (prod) + if: steps.macRunUnit.outcome == 'failure' || steps.macRunIntegration.outcome == 'failure' || steps.macRunMainview.outcome == 'failure' || steps.macRunLivepreview.outcome == 'failure' || steps.macRunLegacyInteg.outcome == 'failure' + run: | + echo "Mac (prod) tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.macRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.macRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.macRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.macRunLivepreview.outcome }}" == "failure" ]; then + echo "- Run tauri livepreview tests" + fi + if [ "${{ steps.macRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 + testDesktopWindows: runs-on: windows-latest timeout-minutes: 90 diff --git a/.github/workflows/staging-desktop-tests-on-pull.yml b/.github/workflows/staging-desktop-tests-on-pull.yml index 5cd743b..5089812 100644 --- a/.github/workflows/staging-desktop-tests-on-pull.yml +++ b/.github/workflows/staging-desktop-tests-on-pull.yml @@ -56,6 +56,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: linuxRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -63,6 +65,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: linuxRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -70,6 +74,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: linuxRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -77,11 +83,32 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: linuxRunLegacyInteg + continue-on-error: true with: timeout_minutes: 20 max_attempts: 3 command: xvfb-run ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + - name: Fail on test runs failed in Linux (staging) + if: steps.linuxRunUnit.outcome == 'failure' || steps.linuxRunIntegration.outcome == 'failure' || steps.linuxRunMainview.outcome == 'failure' || steps.linuxRunLegacyInteg.outcome == 'failure' + run: | + echo "Linux (staging) tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.linuxRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.linuxRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.linuxRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.linuxRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 + testDesktopMac: runs-on: macos-15 timeout-minutes: 90 @@ -125,6 +152,8 @@ jobs: - name: Run tauri unit tests uses: nick-fields/retry@v3 + id: macRunUnit + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -132,6 +161,8 @@ jobs: - name: Run tauri integration tests uses: nick-fields/retry@v3 + id: macRunIntegration + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -139,6 +170,8 @@ jobs: - name: Run tauri mainview tests uses: nick-fields/retry@v3 + id: macRunMainview + continue-on-error: true with: timeout_minutes: 12 max_attempts: 3 @@ -146,11 +179,32 @@ jobs: - name: Run tauri LegacyInteg tests uses: nick-fields/retry@v3 + id: macRunLegacyInteg + continue-on-error: true with: timeout_minutes: 30 max_attempts: 3 command: ./src-tauri/target/debug/phoenix-test --run-tests=LegacyInteg -q + - name: Fail on test runs failed in Mac (staging) + if: steps.macRunUnit.outcome == 'failure' || steps.macRunIntegration.outcome == 'failure' || steps.macRunMainview.outcome == 'failure' || steps.macRunLegacyInteg.outcome == 'failure' + run: | + echo "Mac (staging) tests failed, marking step as failed" + echo "Failed tests:" + if [ "${{ steps.macRunUnit.outcome }}" == "failure" ]; then + echo "- Run tauri unit tests" + fi + if [ "${{ steps.macRunIntegration.outcome }}" == "failure" ]; then + echo "- Run tauri integration tests" + fi + if [ "${{ steps.macRunMainview.outcome }}" == "failure" ]; then + echo "- Run tauri mainview tests" + fi + if [ "${{ steps.macRunLegacyInteg.outcome }}" == "failure" ]; then + echo "- Run tauri LegacyInteg tests" + fi + exit 1 + testDesktopWindows: runs-on: windows-latest timeout-minutes: 90