Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a932fbd

Browse filesBrowse files
panvaaduh95
panva
authored and
aduh95
committed
tools: re-enable undici WPTs in daily wpt.fyi job
Refs: #60444 Closes: nodejs/undici#4644 Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #62677 Fixes: nodejs/undici#4644 Refs: #60444 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 430c69d commit a932fbd
Copy full SHA for a932fbd

3 files changed

+135Lines changed: 135 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.github/actions/undici-wpt-current/action.yml‎

Copy file name to clipboard
+56Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Run undici WPT (current)
2+
description: Runs undici WPT tests for undici >= 7 and merges results into the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report to merge into
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/web-platform-tests/wpt
27+
mv test/fixtures/wpt undici/test/web-platform-tests/wpt
28+
- name: Configure hosts
29+
shell: bash
30+
working-directory: undici/test/web-platform-tests/wpt
31+
run: python3 wpt make-hosts-file | sudo tee -a /etc/hosts
32+
- name: Install dependencies
33+
shell: bash
34+
working-directory: undici
35+
run: npm install
36+
- name: Run WPT
37+
shell: bash
38+
working-directory: undici
39+
env:
40+
CI: 'true'
41+
WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
42+
run: npm run test:wpt || true
43+
- name: Merge report
44+
shell: bash
45+
env:
46+
NODE_WPT_REPORT: ${{ inputs.wpt-report }}
47+
UNDICI_WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
48+
run: |
49+
if [ -f "$UNDICI_WPT_REPORT" ]; then
50+
jq -sc '
51+
.[0].results += .[1].results |
52+
.[0].time_end = .[1].time_end |
53+
.[0]
54+
' "$NODE_WPT_REPORT" "$UNDICI_WPT_REPORT" > "${NODE_WPT_REPORT}.tmp"
55+
mv "${NODE_WPT_REPORT}.tmp" "$NODE_WPT_REPORT"
56+
fi
Collapse file

‎.github/actions/undici-wpt-legacy/action.yml‎

Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Run undici WPT (legacy)
2+
description: Runs undici WPT tests for undici < 7 and appends results to the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/wpt/tests
27+
mv test/fixtures/wpt undici/test/wpt/tests
28+
- name: Install dependencies
29+
shell: bash
30+
working-directory: undici
31+
run: npm install
32+
- name: Run WPT
33+
shell: bash
34+
working-directory: undici
35+
env:
36+
WPT_REPORT: ${{ inputs.wpt-report }}
37+
run: npm run test:wpt || true
Collapse file

‎.github/workflows/daily-wpt-fyi.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/daily-wpt-fyi.yml
+42Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,48 @@ jobs:
9595
echo "WPT_REPORT=$(pwd)/out/wpt/wptreport.json" >> $GITHUB_ENV
9696
fi
9797
98+
# undici WPT Runner
99+
- name: Set env.UNDICI_VERSION
100+
if: ${{ env.WPT_REPORT != '' }}
101+
run: |
102+
UNDICI_VERSION=$(jq -r '.version' < deps/undici/src/package.json)
103+
echo "UNDICI_VERSION=v$UNDICI_VERSION" >> $GITHUB_ENV
104+
if [ "${UNDICI_VERSION%%.*}" -ge 7 ]; then
105+
echo "UNDICI_WPT=current" >> $GITHUB_ENV
106+
else
107+
echo "UNDICI_WPT=legacy" >> $GITHUB_ENV
108+
fi
109+
# Checkout composite actions from the default branch since the
110+
# version-specific checkout above overwrites .github/actions/
111+
- name: Checkout undici WPT actions
112+
if: ${{ env.WPT_REPORT != '' }}
113+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
114+
with:
115+
sparse-checkout: |
116+
.github/actions/undici-wpt-current
117+
.github/actions/undici-wpt-legacy
118+
sparse-checkout-cone-mode: false
119+
persist-credentials: false
120+
path: _wpt_actions
121+
clean: false
122+
- name: Place undici WPT actions
123+
if: ${{ env.WPT_REPORT != '' }}
124+
run: |
125+
mkdir -p .github/actions
126+
cp -r _wpt_actions/.github/actions/undici-wpt-* .github/actions/
127+
- name: Run undici WPT (current)
128+
if: ${{ env.UNDICI_WPT == 'current' }}
129+
uses: ./.github/actions/undici-wpt-current
130+
with:
131+
undici-version: ${{ env.UNDICI_VERSION }}
132+
wpt-report: ${{ env.WPT_REPORT }}
133+
- name: Run undici WPT (legacy)
134+
if: ${{ env.UNDICI_WPT == 'legacy' }}
135+
uses: ./.github/actions/undici-wpt-legacy
136+
with:
137+
undici-version: ${{ env.UNDICI_VERSION }}
138+
wpt-report: ${{ env.WPT_REPORT }}
139+
98140
# Upload artifacts
99141
- name: Clone report for upload
100142
if: ${{ env.WPT_REPORT != '' }}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.