Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

[New]Simplify mac-wpt workflow. (#36068)

Browse source 
* [New]Simplify mac-wpt workflow

Signed-off-by: richarddushime <mudaherarich@gmail.com>

* Fix Requested changes

Signed-off-by: richarddushime <mudaherarich@gmail.com>

* Remove wpt-layout in mac.yml

Signed-off-by: richarddushime <mudaherarich@gmail.com>

---------

Signed-off-by: richarddushime <mudaherarich@gmail.com>
This commit is contained in:
Richard Dushime 2025-03-22 04:28:22 +01:00 • committed by GitHub
parent b45a3dca87
commit cb5dd3172a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
.github/workflows/mac-wpt.yml vendored
View file

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

1
.github/workflows/mac.yml vendored
View file

@ -212,7 +212,6 @@ jobs:
uses: ./.github/workflows/mac-wpt.yml uses: ./.github/workflows/mac-wpt.yml
with: with:
profile: ${{ inputs.profile }} profile: ${{ inputs.profile }}
wpt-layout: "layout-2020"
wpt-args: ${{ inputs.wpt-args }} wpt-args: ${{ inputs.wpt-args }}
secrets: inherit secrets: inherit