[pull] master from web-platform-tests:master

.azure-pipelines.yml

@@ -19,8 +19,6 @@ trigger:
 - triggers/edge_stable
 - triggers/edge_dev
 - triggers/edge_canary
-- triggers/safari_stable
-- triggers/safari_preview
 - triggers/wktr_preview
 
 # Set safaridriver_diagnose to true to enable safaridriver diagnostics. The
@@ -445,84 +443,6 @@ jobs:
     dependsOn: results_edge_canary
     artifactName: edge-canary-results
 
-- job: results_safari
-  displayName: 'all tests: Safari'
-  condition: |
-    or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/daily'),
-       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/safari_stable'),
-       and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_safari']))
-  strategy:
-    parallel: 8 # chosen to make runtime ~2h
-  timeoutInMinutes: 180
-  pool:
-    vmImage: 'macOS-14'
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.12'
-  - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/install_certs.yml
-  - template: tools/ci/azure/color_profile.yml
-  - template: tools/ci/azure/install_safari.yml
-    parameters:
-      channel: stable
-  - template: tools/ci/azure/update_hosts.yml
-  - template: tools/ci/azure/update_manifest.yml
-  - script: |
-      set -eux -o pipefail
-      export SYSTEM_VERSION_COMPAT=0
-      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel stable --kill-safari --max-restarts 100 safari
-    displayName: 'Run tests'
-    retryCountOnTaskFailure: 2
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish results'
-    inputs:
-      artifactName: 'safari-results'
-  - template: tools/ci/azure/publish_logs.yml
-  - template: tools/ci/azure/sysdiagnose.yml
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: results_safari
-    artifactName: safari-results
-
-- job: results_safari_preview
-  displayName: 'all tests: Safari Technology Preview'
-  condition: |
-    or(eq(variables['Build.SourceBranch'], 'refs/heads/epochs/three_hourly'),
-       eq(variables['Build.SourceBranch'], 'refs/heads/triggers/safari_preview'),
-       and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_safari_preview']))
-  strategy:
-    parallel: 8 # chosen to make runtime ~2h
-  timeoutInMinutes: 180
-  pool:
-    vmImage: 'macOS-14'
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.12'
-  - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/install_certs.yml
-  - template: tools/ci/azure/color_profile.yml
-  - template: tools/ci/azure/install_safari.yml
-  - template: tools/ci/azure/update_hosts.yml
-  - template: tools/ci/azure/update_manifest.yml
-  - script: |
-      set -eux -o pipefail
-      export SYSTEM_VERSION_COMPAT=0
-      ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel preview --kill-safari --max-restarts 100 safari
-    displayName: 'Run tests'
-    retryCountOnTaskFailure: 2
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish results'
-    inputs:
-      artifactName: 'safari-preview-results'
-  - template: tools/ci/azure/publish_logs.yml
-  - template: tools/ci/azure/sysdiagnose.yml
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: results_safari_preview
-    artifactName: safari-preview-results
-
 - job: results_wktr_preview
   displayName: 'all tests: WebKitTestRunner'
   condition: |

.github/META.yml

@@ -1,3 +1,4 @@
 suggested_reviewers:
   - foolip
   - jgraham
+  - past

.github/workflows/check-workflow-run.yml

@@ -0,0 +1,55 @@
+name: Check workflow_run
+
+on:
+  workflow_call:
+    inputs:
+      check-refs:
+        description: "Refs to check whether they've been updated"
+        required: true
+        type: string
+    outputs:
+      updated-refs:
+        description: "Refs which have been updated"
+        value: ${{ jobs.check-workflow-run.outputs.output }}
+
+jobs:
+  check-workflow-run:
+    name: "Check for appropriate epochs"
+    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
+    runs-on:
+      - ubuntu-22.04
+    permissions:
+      actions: read
+    outputs:
+      output: ${{ steps.check.outputs.updated-refs }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            tools
+      - uses: actions/download-artifact@v4
+        with:
+          name: git-push-output
+          path: ${{ runner.temp }}/git-push-output
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - id: check
+        run: |
+          {
+              echo 'updated-refs<<EOF'
+              python3 tools/ci/check_for_updated_refs.py
+              echo EOF
+          } >> "$GITHUB_OUTPUT"
+        env:
+          GIT_PUSH_OUTPUT: ${{ runner.temp }}/git-push-output/git-push-output.txt
+          REFS: ${{ inputs.check-refs }}
+
+  check-workflow-run-noop:
+    name: "Check for appropriate epochs (noop)"
+    if: ${{ github.event_name != 'workflow_run' }}
+    runs-on:
+      - ubuntu-22.04
+    steps:
+      - run: exit 0

.github/workflows/docker.yml

@@ -40,7 +40,7 @@ jobs:
             latest
             type=raw,value=${{ inputs.tag }}
       - name: Build and push the Docker image
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
         with:
           context: ./tools/docker
           push: true

.github/workflows/documentation.yml

@@ -15,6 +15,7 @@ on:
 jobs:
   build-and-publish:
     runs-on: ubuntu-20.04
+    if: github.repository == 'web-platform-tests/wpt'
     steps:
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -31,8 +32,6 @@ jobs:
         with:
           fetch-depth: 50
       - name: Run website_build.sh
-        # Use a conditional step instead of a conditional job to work around #20700.
-        if: github.repository == 'web-platform-tests/wpt'
         run: ./tools/ci/website_build.sh
         env:
           DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}

.github/workflows/epochs.yml

@@ -7,14 +7,20 @@ on:
 jobs:
   update:
     runs-on: ubuntu-20.04
+    if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Run epochs_update.sh
-      # Use a conditional step instead of a conditional job to work around #20700.
-      if: github.repository == 'web-platform-tests/wpt'
       run: ./tools/ci/epochs_update.sh
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Upload git-push output
+      uses: actions/upload-artifact@v4
+      with:
+        name: git-push-output
+        path: ${{ runner.temp }}/git-push-output.txt
+        if-no-files-found: error
+        compression-level: 1

.github/workflows/interfaces.yml

@@ -7,14 +7,13 @@ on:
 jobs:
   update:
     runs-on: ubuntu-20.04
+    if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Run interfaces_update.sh
       run: ./tools/ci/interfaces_update.sh
     - name: Create pull request
-      # Use a conditional step instead of a conditional job to work around #20700.
-      if: github.repository == 'web-platform-tests/wpt'
       uses: peter-evans/create-pull-request@v6
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manifest.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   build-and-tag:
     runs-on: ubuntu-20.04
+    if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -23,8 +24,6 @@ jobs:
         sudo apt-get -qqy install zstd
         pip install -r tools/wpt/requirements.txt
     - name: Run manifest_build.py
-      # Use a conditional step instead of a conditional job to work around #20700.
-      if: github.repository == 'web-platform-tests/wpt'
       run: tools/docker/retry.py --delay 60 python tools/ci/manifest_build.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/regen_certs.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   update:
     runs-on: ubuntu-20.04
+    if: github.repository == 'web-platform-tests/wpt'
     steps:
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -16,14 +17,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Regenerate certs
-      # Use a conditional step instead of a conditional job to work around #20700.
-      if: github.repository == 'web-platform-tests/wpt'
       run: |
         python wpt make-hosts-file | sudo tee -a /etc/hosts
         python wpt regen-certs --force
     - name: Commit and create pull request
-      # Use a conditional step instead of a conditional job to work around #20700.
-      if: github.repository == 'web-platform-tests/wpt'
       uses: peter-evans/create-pull-request@v6
       with:
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/safari-wptrunner.yml

@@ -0,0 +1,115 @@
+name: Run Safari Tests
+
+on:
+  workflow_call:
+    inputs:
+      artifact-name:
+        description: "Prefix for the artifact uploaded"
+        required: true
+        type: string
+      safari-technology-preview:
+        description: "Run Safari Technology Preview rather than the system Safari"
+        required: true
+        type: boolean
+      safaridriver-diagnose:
+        description: "Run safaridriver capturing diagnostics"
+        required: true
+        type: boolean
+
+# We never interact with the GitHub API, thus we can simply disable all
+# permissions the GitHub token would have.
+permissions: {}
+
+jobs:
+  safari-results:
+    name: ${{ inputs.safari-technology-preview && 'Safari Technology Preview' || 'Safari' }}
+    runs-on:
+      - self-hosted
+      - webkit-ews
+    timeout-minutes: 180
+    strategy:
+      matrix:
+        current-chunk: [1, 2, 3, 4, 5, 6, 7, 8]
+        total-chunks: [8]
+    steps:
+      - name: checkout
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 1
+      - name: Set display color profile
+        run: |-
+          ./wpt macos-color-profile
+      - name: Enable safaridriver diagnostics
+        if: inputs.safaridriver-diagnose
+        run: |-
+          rm -rf ~/Library/Logs/com.apple.WebDriver/
+          defaults write com.apple.WebDriver DiagnosticsEnabled 1
+      - name: Enable safaridriver (Safari)
+        if: ${{ !inputs.safari-technology-preview }}
+        run: |-
+          set -eux -o pipefail
+          sudo safaridriver --enable
+      - name: Enable safaridriver (Safari Technology Preview)
+        if: ${{ inputs.safari-technology-preview }}
+        run: |-
+          set -eux -o pipefail
+          export SYSTEM_VERSION_COMPAT=0
+          ./wpt install --channel preview --download-only -d . --rename STP safari browser
+          sudo installer -pkg STP.pkg -target LocalSystem
+          sudo /Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver --enable
+      - name: Update hosts
+        run: |-
+          set -eux -o pipefail
+          ./wpt make-hosts-file | sudo tee -a /etc/hosts
+      - name: Update manifest
+        run: ./wpt manifest
+      - name: Run tests
+        run: |-
+          set -eux -o pipefail
+          export SYSTEM_VERSION_COMPAT=0
+          ./wpt run \
+            --no-manifest-update \
+            --no-restart-on-unexpected \
+            --no-fail-on-unexpected \
+            --this-chunk=${{ matrix.current-chunk }} \
+            --total-chunks=${{ matrix.total-chunks }} \
+            --chunk-type hash \
+            --log-wptreport ${{ runner.temp }}/wpt_report_${{ matrix.current-chunk }}.json \
+            --log-wptscreenshot ${{ runner.temp }}/wpt_screenshot_${{ matrix.current-chunk }}.txt \
+            --log-mach - \
+            --log-mach-level info \
+            --channel ${{ inputs.safari-technology-preview && 'preview' || 'stable' }} \
+            --kill-safari \
+            --max-restarts 100 \
+            safari
+      - name: Publish results
+        uses: actions/[email protected]
+        with:
+          name: ${{ inputs.artifact-name }}-${{ matrix.current-chunk }}
+          path: |
+            ${{ runner.temp }}/wpt_report_*.json
+            ${{ runner.temp }}/wpt_screenshot_*.txt
+          if-no-files-found: "error"
+      - name: Publish safaridriver logs
+        if: inputs.safaridriver-diagnose
+        uses: actions/[email protected]
+        with:
+          name: ${{ inputs.artifact-name }}-safaridriver-logs-${{ matrix.current-chunk }}
+          path: ~/Library/Logs/com.apple.WebDriver/
+          if-no-files-found: warn
+      - name: Disable safaridriver diagnostics
+        if: inputs.safaridriver-diagnose
+        run: |-
+          defaults write com.apple.WebDriver DiagnosticsEnabled 0
+          rm -rf ~/Library/Logs/com.apple.WebDriver/
+      - name: Cleanup
+        if: always()
+        run: |-
+            set -ux
+            sudo sed -i '' '/^# Start web-platform-tests hosts$/,/^# End web-platform-tests hosts$/d' /etc/hosts
+
+  safari-notify:
+    needs: safari-results
+    uses: ./.github/workflows/wpt_fyi_notify.yml
+    with:
+      artifact-name: "${{ inputs.artifact-name }}-*"