diff --git a/.github/workflows/mac-wpt.yml b/.github/workflows/mac-wpt.yml index 6799e9b447c..637cc74f56b 100644 --- a/.github/workflows/mac-wpt.yml +++ b/.github/workflows/mac-wpt.yml @@ -10,9 +10,6 @@ on: profile: required: true type: string - wpt-layout: - required: true - type: string env: RUST_BACKTRACE: 1 @@ -20,7 +17,7 @@ env: jobs: mac-wpt: - name: WPT ${{ inputs.wpt-layout }} + name: WPT runs-on: macos-13 env: max_chunk_id: 5 @@ -50,26 +47,26 @@ jobs: run: ./mach smoketest --${{ inputs.profile }} - name: Run tests run: | - mkdir -p wpt-filtered-logs/macos-${{ inputs.wpt-layout }} - mkdir -p wpt-full-logs/macos-${{ inputs.wpt-layout }} + mkdir -p wpt-filtered-logs/macos + mkdir -p wpt-full-logs/macos ./mach test-wpt \ --${{ inputs.profile }} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ - --log-raw wpt-full-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \ - --log-raw-unexpected wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \ - --filter-intermittents wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json + --log-raw wpt-full-logs/macos/${{ matrix.chunk_id }}.log \ + --log-raw-unexpected wpt-filtered-logs/macos/${{ matrix.chunk_id }}.log \ + --filter-intermittents wpt-filtered-logs/macos/${{ matrix.chunk_id }}.json ${{ inputs.wpt-args }} - name: Archive results (filtered) uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }} + name: wpt-filtered-logs-macos-${{ matrix.chunk_id }} path: wpt-filtered-logs/*/ - name: Archive results (full) uses: actions/upload-artifact@v4 if: ${{ always() }} with: - name: wpt-full-logs-macos-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }} + name: wpt-full-logs-macos-${{ matrix.chunk_id }} path: wpt-full-logs/*/ report-test-results: @@ -81,14 +78,14 @@ jobs: - name: Merge logs (filtered) uses: actions/upload-artifact/merge@v4 with: - name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }} - pattern: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}-* + name: wpt-filtered-logs-macos + pattern: wpt-filtered-logs-macos-* delete-merged: true - name: Merge logs (full) uses: actions/upload-artifact/merge@v4 with: - name: wpt-full-logs-macos-${{ inputs.wpt-layout }} - pattern: wpt-full-logs-macos-${{ inputs.wpt-layout }}-* + name: wpt-full-logs-macos + pattern: wpt-full-logs-macos-* delete-merged: true - uses: actions/checkout@v3 if: ${{ !cancelled() }} @@ -97,14 +94,14 @@ jobs: - uses: actions/download-artifact@v4 if: ${{ !cancelled() }} with: - name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }} + name: wpt-filtered-logs-macos path: results - name: Report results if: ${{ !cancelled() }} run: | etc/ci/report_aggregated_expected_results.py \ - --tag="macos-wpt-${{ inputs.wpt-layout }}" \ - results/macos-${{ inputs.wpt-layout }}/*.json + --tag="macos-wpt" \ + results/macos/*.json env: GITHUB_CONTEXT: ${{ toJson(github) }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 4fd5f24504a..41fb70eab83 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -212,7 +212,6 @@ jobs: uses: ./.github/workflows/mac-wpt.yml with: profile: ${{ inputs.profile }} - wpt-layout: "layout-2020" wpt-args: ${{ inputs.wpt-args }} secrets: inherit