Merge branch 'microsoft:main' into iphone-14-support

microsoft · Aug 8, 2023 · 88ce203 · 88ce203
2 parents 89651bf + 0e20d35
commit 88ce203
Show file tree

Hide file tree

Showing 121 changed files with 2,823 additions and 862 deletions.
diff --git a/.github/actions/upload-blob-report/action.yml b/.github/actions/upload-blob-report/action.yml
@@ -5,7 +5,7 @@ inputs:
     description: 'Directory containing blob report'
     required: true
     type: string
-    default: 'test-results/blob-report'
+    default: 'blob-report'
   connection_string:
     description: 'Azure connection string'
     required: true
@@ -23,7 +23,7 @@ runs:
       if: always() && github.event_name == 'pull_request'
       uses: actions/upload-artifact@v3
       with:
-        name: blob-report-${{ github.run_attempt }}
+        name: all-blob-reports
         path: ${{ inputs.report_dir }}
         retention-days: 30
     - name: Write triggering pull request number in a file

diff --git a/.github/workflows/create_test_report.yml b/.github/workflows/create_test_report.yml
@@ -26,12 +26,12 @@ jobs:
     - name: Download blob report artifact
       uses: ./.github/actions/download-artifact
       with:
-        name: 'blob-report-${{ github.event.workflow_run.run_attempt }}'
-        path: 'blob-report'
+        name: all-blob-reports
+        path: all-blob-reports
 
     - name: Merge reports
       run: |
-        npx playwright merge-reports --reporter markdown,html blob-report
+        npx playwright merge-reports --reporter markdown,html ./all-blob-reports
 
     - name: Upload HTML report to Azure
       run: |

diff --git a/.github/workflows/tests_grid.yml b/.github/workflows/tests_grid.yml
@@ -0,0 +1,25 @@
+name: "tests grid"
+
+on:
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 1
+  ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+
+jobs:
+  test:
+    name: "Grid"
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+    - run: npm ci
+      env:
+        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+    - run: npm run build
+    - run: npx playwright install-deps
+    - run: npx playwright install
+    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --retries=0
+      env:
+        PWTEST_MODE: service-grid
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
@@ -55,7 +55,7 @@ jobs:
     - run: npx playwright install --with-deps ${{ matrix.browser }} chromium
     - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}
       env:
-        PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
+        PWTEST_BLOB_REPORT_NAME: "${{ matrix.browser }}-${{ matrix.os }}-node${{ matrix.node-version }}"
     - run: node tests/config/checkCoverage.js ${{ matrix.browser }}
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
@@ -64,7 +64,7 @@ jobs:
       if: always() && github.event_name == 'pull_request'
       uses: ./.github/actions/upload-blob-report
       with:
-        report_dir: test-results/blob-report
+        report_dir: blob-report
         connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}'
 
   test_linux_chromium_tot:
@@ -88,15 +88,15 @@ jobs:
     - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=chromium
       env:
         PWTEST_CHANNEL: chromium-tip-of-tree
-        PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-chromium-tip-of-tree"
+        PWTEST_BLOB_REPORT_NAME: "${{ matrix.os }}-chromium-tip-of-tree"
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
       shell: bash
     - name: Upload blob report
       if: always() && github.event_name == 'pull_request'
       uses: ./.github/actions/upload-blob-report
       with:
-        report_dir: test-results/blob-report
+        report_dir: blob-report
         connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}'
 
   test_test_runner:
@@ -133,11 +133,11 @@ jobs:
     - run: npx playwright install --with-deps
     - run: npm run ttest -- --shard ${{ matrix.shard }}
       env:
-        PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
+        PWTEST_BLOB_REPORT_NAME: "${{ matrix.os }}-node${{ matrix.node-version }}"
       if: matrix.os != 'ubuntu-latest'
     - run: xvfb-run npm run ttest --  --shard ${{ matrix.shard }}
       env:
-        PWTEST_BLOB_SUFFIX: "-${{ matrix.os }}-node${{ matrix.node-version }}"
+        PWTEST_BLOB_REPORT_NAME: "${{ matrix.os }}-node${{ matrix.node-version }}"
       if: matrix.os == 'ubuntu-latest'
     - run: ./utils/upload_flakiness_dashboard.sh ./test-results/report.json
       if: always()
@@ -146,7 +146,7 @@ jobs:
       if: always() && github.event_name == 'pull_request'
       uses: ./.github/actions/upload-blob-report
       with:
-        report_dir: test-results/blob-report
+        report_dir: blob-report
         connection_string: '${{ secrets.AZURE_CONNECTION_STRING_FOR_BLOB_REPORT }}'
 
   test_web_components: