Add Layout 2020 support to nightly WPT update

.github/workflows/wpt-nightly.yml

@@ -23,16 +23,25 @@ jobs:
           python3 -m pip install --upgrade pip virtualenv
           sudo apt update
           python3 ./mach bootstrap
-      - name: Release build
+      - name: Release build (Layout 2013)
         run: python3 ./mach build --release
       - name: Lockfile check
         run: ./etc/ci/lockfile_changed.sh
-      - name: Package binary
+      - name: Package binary (Layout 2013)
         run: tar -czf target.tar.gz target/release/servo resources
-      - name: Archive binary
+      - name: Archive binary (Layout 2013)
         uses: actions/upload-artifact@v3
         with:
-          name: release-binary
+          name: layout-2013-release-binary
+          path: target.tar.gz
+      - name: Release build (Layout 2020)
+        run: python3 ./mach build --release --with-layout-2020
+      - name: Package binary (Layout 2020)
+        run: tar -czf target.tar.gz target/release/servo resources
+      - name: Archive binary (Layout 2020)
+        uses: actions/upload-artifact@v3
+        with:
+          name: layout-2020-release-binary
           path: target.tar.gz
 
   linux-wpt:
@@ -46,13 +55,14 @@ jobs:
     strategy:
       matrix:
         chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+        configuration: ["layout-2013", "layout-2020"]
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - uses: actions/download-artifact@v3
         with:
-          name: release-binary
+          name: ${{ matrix.configuration }}-release-binary
           path: release-binary
       - name: unPackage binary
         run: tar -xzf release-binary/target.tar.gz
@@ -72,16 +82,16 @@ jobs:
           python3 ./mach test-wpt \
             --release --processes $(nproc) --timeout-multiplier 2 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
-            --log-raw test-wpt.${{ matrix.chunk_id }}.log \
-            --log-servojson wpt-jsonsummary.${{ matrix.chunk_id }}.log \
+            --log-raw test-wpt.${{ matrix.configuration }}.${{ matrix.chunk_id }}.log \
+            --log-servojson wpt-jsonsummary.${{ matrix.configuration }}.${{ matrix.chunk_id }}.log \
             --always-succeed
       - name: Archive logs
         uses: actions/upload-artifact@v3
         with:
           name: wpt-logs-linux
           path: |
-            test-wpt.${{ matrix.chunk_id }}.log
-            wpt-jsonsummary.${{ matrix.chunk_id }}.log
+            test-wpt.${{ matrix.configuration }}.${{ matrix.chunk_id }}.log
+            wpt-jsonsummary.${{ matrix.configuration }}.${{ matrix.chunk_id }}.log
 
   sync:
     # This job is only useful when run on upstream servo.