From b3ecaeb7fa1955c9c6cbed5d5b467ec312f8e000 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Sat, 17 Aug 2024 14:16:45 -0700 Subject: [PATCH 1/3] updates Signed-off-by: Jess Frazelle --- .github/workflows/playwright.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 03649340ea..03c7c04bcb 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -40,7 +40,7 @@ jobs: matrix: shardIndex: [1, 2, 3, 4] shardTotal: [4] - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-14] runs-on: ${{ matrix.os }} needs: check-rust-changes steps: @@ -64,6 +64,11 @@ jobs: - name: Install Playwright Browsers shell: bash run: yarn playwright install --with-deps + - name: install chrome from the cask macos + if: ${{ startsWith(matrix.os, 'macos') }} + shell: bash + run: | + brew install --cask google-chrome - name: Download Wasm Cache id: download-wasm if: needs.check-rust-changes.outputs.rust-changed == 'false' From ef2e7d83b0335bf0b3d29aa9944f93d8669afa17 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Sat, 17 Aug 2024 14:26:31 -0700 Subject: [PATCH 2/3] fix outputs Signed-off-by: Jess Frazelle --- .github/workflows/playwright.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 03c7c04bcb..4262f2eb0d 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -130,7 +130,7 @@ jobs: - name: build web run: yarn build:local shell: bash - - name: Run ubuntu/chrome snapshots + - name: Run playwright/chrome snapshots shell: bash run: | yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --retries="3" --update-snapshots --grep=@snapshot --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} @@ -144,7 +144,7 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ !cancelled() && (success() || failure()) }} with: - name: playwright-report-ubuntu-snapshot-${{ matrix.shardIndex }}-${{ github.sha }} + name: playwright-report-${{matrix.os}}-snapshot-${{ matrix.shardIndex }}-${{ github.sha }} path: playwright-report/ retention-days: 30 overwrite: true @@ -179,14 +179,14 @@ jobs: - uses: actions/upload-artifact@v4 if: steps.git-check.outputs.modified == 'true' with: - name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }} + name: playwright-report-${{matrix.os}}-${{ matrix.shardIndex }}-${{ github.sha }} path: playwright-report/ retention-days: 30 - uses: actions/download-artifact@v4 if: ${{ !cancelled() && (success() || failure()) }} continue-on-error: true with: - name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }} + name: test-results-${{matrix.os}}-${{ matrix.shardIndex }}-${{ github.sha }} path: test-results/ - name: Run playwright/chrome flow (with retries) id: retry @@ -249,14 +249,14 @@ jobs: - uses: actions/upload-artifact@v4 if: always() with: - name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }} + name: test-results-${{matrix.os}}-${{ matrix.shardIndex }}-${{ github.sha }} path: test-results/ retention-days: 30 overwrite: true - uses: actions/upload-artifact@v4 if: always() with: - name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }} + name: playwright-report-${{matrix.os}}-${{ matrix.shardIndex }}-${{ github.sha }} path: playwright-report/ retention-days: 30 overwrite: true @@ -356,7 +356,7 @@ jobs: if: ${{ !cancelled() && (success() || failure()) }} continue-on-error: true with: - name: test-results-ubuntu-${{ github.sha }} + name: test-results-${{matrix.os}}-${{ github.sha }} path: test-results/ - name: Run electron tests (with retries) id: retry From cee27abe956ec3129d3ba94f97693edd7ff20bb2 Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Sat, 17 Aug 2024 14:27:17 -0700 Subject: [PATCH 3/3] fux Signed-off-by: Jess Frazelle --- .github/workflows/playwright.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 4262f2eb0d..aa25617762 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -63,6 +63,7 @@ jobs: key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }} - name: Install Playwright Browsers shell: bash + if: ${{ !startsWith(matrix.os, 'macos') }} run: yarn playwright install --with-deps - name: install chrome from the cask macos if: ${{ startsWith(matrix.os, 'macos') }}