Fix WPT sync and simplify the update scripts (#29999)

Much of the code used to import WPT tests from upstream has been moved
to the WPT repository itself, so this can be reused. In addition,
simplify the workflows by merging the entire process into mach and also
directly into the GitHub workflow. This should fix WPT imports after
combining compilation of layout and legacy layout.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

.github/workflows/linux-wpt.yml

@@ -41,10 +41,10 @@ jobs:
           wget http://mirrors.kernel.org/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
           sudo apt install ./libffi6_3.2.1-8_amd64.deb
           python3 ./mach bootstrap-gstreamer
-      - name: Fetch upstream changes before testing
+      - name: Sync from upstream WPT
         if: ${{ inputs.wpt == 'sync' }}
         run: |
-          ./etc/ci/update-wpt-checkout fetch-upstream-changes
+          ./mach update-wpt --sync --patch
       - name: Run tests
         if: ${{ inputs.wpt != 'sync' }}
         run: |

.github/workflows/pull-request-wpt-export.yml

@@ -1,4 +1,4 @@
-name: Pull request (WPT export)
+name: WPT Export
 on:
   pull_request_target:
     types: ['opened', 'synchronize', 'reopened', 'edited', 'closed']

.github/workflows/scheduled-wpt-import.yml

@@ -1,4 +1,4 @@
-name: Scheduled WPT import
+name: WPT Import
 
 on:
   schedule:
@@ -46,16 +46,16 @@ jobs:
           git fetch --unshallow upstream
       - name: Fetch upstream changes before syncing
         run: |
-          ./etc/ci/update-wpt-checkout fetch-upstream-changes
-      - name: Run WPT Update
-        env:
-          MAX_CHUNK_ID: 20
-          WPT_SYNC_TOKEN: ${{ secrets.WPT_SYNC_TOKEN }}
+          ./mach update-wpt --sync --patch
+      - name: Amend commit with test results
         run: |
           export CURRENT_DATE=$(date +"%d-%m-%Y")
           echo $CURRENT_DATE
           echo "CURRENT_DATE=$CURRENT_DATE" >> $GITHUB_ENV
-          ./etc/ci/wpt-scheduled-update.sh
+          ./mach update-wpt wpt-logs-linux-layout-2013/test-wpt.*.log
+          ./mach update-wpt --layout-2020 wpt-logs-linux-layout-2020/test-wpt.*.log
+          git add tests/wpt/meta tests/wpt/meta-legacy-layout
+          git commit -a --amend --no-edit
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
@@ -68,9 +68,8 @@ jobs:
           BODY=$(cat <<EOF
           Automated downstream sync of changes from upstream as of ${{ env.CURRENT_DATE }}
           [no-wpt-sync]
-          r? @servo-wpt-sync
           EOF
           )
           gh pr create \
             --title "Sync WPT with upstream (${{ env.CURRENT_DATE }})" \
-            --body "$BODY" --head ${{ env.UPDATE_BRANCH }}"
+            --body "$BODY" --head ${{ env.UPDATE_BRANCH }}