Merge pull request #9 from servo/consume-runtime-switch-binary

Consume servo nightly with runtime layout switch
servo · Jul 10, 2023 · af192b0 · af192b0
2 parents 285038b + 2d341eb
commit af192b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/run-wpt.yml b/.github/workflows/run-wpt.yml
@@ -1,9 +1,12 @@
 name: Reusable workflow to execute WPT against Servo nightly.
 
+env:
+  NIGHTLY_PATH: https://download.servo.org/nightly/linux/servo-latest.tar.gz
+
 on:
   workflow_call:
     inputs:
-      nightly-path:
+      layout-engine:
         required: true
         type: string
       artifact-name:
@@ -36,7 +39,7 @@ jobs:
       - name: Download latest nightly
         run: |
           ./mach bootstrap-gstreamer
-          wget -O servo-latest.tar.gz "${{ inputs.nightly-path }}"
+          wget -O servo-latest.tar.gz "${{ env.NIGHTLY_PATH }}"
           tar -xzf servo-latest.tar.gz
           mkdir -p target/release
           mv servo/resources target/release/resources
@@ -46,6 +49,10 @@ jobs:
           echo Downloaded $SERVO_VERSION
           echo "SERVO_VERSION=$SERVO_VERSION" >> $GITHUB_ENV
         working-directory: servo
+      - name: Override include.ini
+        if: ${{ inputs.layout-engine == '2020' }}
+        run: cp tests/wpt/include-legacy-layout.ini tests/wpt/include.ini
+        working-directory: servo
       - name: Run tests
         run: |
           python3 ./mach test-wpt \
@@ -55,7 +62,8 @@ jobs:
             --always-succeed \
             --browser-version "$SERVO_VERSION" \
             --this-chunk ${{ matrix.chunk_id }} \
-            --total-chunks ${{ env.max_chunk_id }}
+            --total-chunks ${{ env.max_chunk_id }} \
+            --layout-${{ inputs.layout-engine }}
         working-directory: servo
       - name: Archive the wpt result chunk
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/update-scores.yml b/.github/workflows/update-scores.yml
@@ -20,13 +20,13 @@ jobs:
   wpt-for-layout-2013:
     uses: ./.github/workflows/run-wpt.yml
     with:
-      nightly-path: https://github.com/servo/servo-nightly-builds/releases/latest/download/servo-latest-legacy-layout.tar.gz
+      layout-engine: 2013
       artifact-name: wpt-chunks
 
   wpt-for-layout-2020:
     uses: ./.github/workflows/run-wpt.yml
     with:
-      nightly-path: https://download.servo.org/nightly/linux/servo-latest.tar.gz
+      layout-engine: 2020
       artifact-name: wpt-chunks-2020
 
   process-new-run: