diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml index 5ec4b0f421..2ade5f91bc 100644 --- a/.github/workflows/e2e-crossplatform.yml +++ b/.github/workflows/e2e-crossplatform.yml @@ -10,6 +10,9 @@ on: - packages/common/** - packages/e2e-tests/** - 3rd-party/** + - .github/workflows/e2e** + - .github/actions/setup-env/** + - .github/actions/before-build/** jobs: mac: diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml index 894337da4d..867eb20201 100644 --- a/.github/workflows/e2e-mac.yml +++ b/.github/workflows/e2e-mac.yml @@ -3,7 +3,16 @@ name: E2E Mac on: [workflow_call] jobs: mac: - runs-on: macos-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - os: macos-latest + binary_suffix: "-arm64" + - os: macos-26-intel + binary_suffix: "" + timeout-minutes: 180 env: TEST_MODE: true @@ -38,7 +47,7 @@ jobs: - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet-$VERSION-arm64.dmg"" >> $GITHUB_ENV + run: echo "FILE_NAME="Quiet-$VERSION${{matrix.binary_suffix}}.dmg"" >> $GITHUB_ENV - name: List dist dir content working-directory: ./packages/desktop/dist @@ -53,7 +62,7 @@ jobs: run: hdiutil mount $FILE_NAME - name: Add App file to applications - run: cd ~ && cp -R "/Volumes/Quiet $VERSION-arm64/Quiet.app" /Applications + run: cd ~ && cp -R "/Volumes/Quiet $VERSION${{matrix.binary_suffix}}/Quiet.app" /Applications - name: Run one client test uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0