Skip to content

Commit d1ff9a0

Browse files
committed
tools: avoid test/fixtures/wpt/README.md conflicts
Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: nodejs#63938 Refs: nodejs/node-core-utils#1094 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mattias Buelens <mattias@buelens.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
1 parent d001e26 commit d1ff9a0

2 files changed

Lines changed: 11 additions & 33 deletions

File tree

.github/workflows/update-wpt.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ jobs:
5252
- name: Update WPT for subsystem ${{ matrix.subsystem }}
5353
run: |
5454
git node wpt "$SUBSYSTEM"
55+
# TODO: Remove this workaround after @node-core/utils stops
56+
# regenerating test/fixtures/wpt/README.md for every subsystem
57+
# update.
58+
# git node wpt currently rewrites test/fixtures/wpt/README.md with a
59+
# generated summary for every subsystem update. versions.json is the
60+
# authoritative metadata, and keeping the README stable avoids
61+
# conflicts between concurrent WPT update PRs.
62+
git restore test/fixtures/wpt/README.md
5563
env:
5664
SUBSYSTEM: ${{ matrix.subsystem }}
5765

test/fixtures/wpt/README.md

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,14 @@
11
# Web Platform Test Fixtures
22

3-
The files in this folder, including this document,
4-
are generated by [`git node wpt`][].
3+
The files in this folder are maintained by [`git node wpt`][].
54

65
This folder contains a subset of the [Web Platform Tests][] for the
76
implementation of Web APIs in Node.js.
87

98
See [test/wpt](../../wpt/README.md) for information on how these tests are run.
109

11-
Last update:
12-
13-
- common: https://github.com/web-platform-tests/wpt/tree/dbd648158d/common
14-
- compression: https://github.com/web-platform-tests/wpt/tree/ae05f5cb53/compression
15-
- console: https://github.com/web-platform-tests/wpt/tree/e48251b778/console
16-
- dom/abort: https://github.com/web-platform-tests/wpt/tree/dc928169ee/dom/abort
17-
- dom/events: https://github.com/web-platform-tests/wpt/tree/0a811c5161/dom/events
18-
- encoding: https://github.com/web-platform-tests/wpt/tree/1ac8deee08/encoding
19-
- fetch/data-urls/resources: https://github.com/web-platform-tests/wpt/tree/7c79d998ff/fetch/data-urls/resources
20-
- FileAPI: https://github.com/web-platform-tests/wpt/tree/7f51301888/FileAPI
21-
- hr-time: https://github.com/web-platform-tests/wpt/tree/34cafd797e/hr-time
22-
- html/webappapis/atob: https://github.com/web-platform-tests/wpt/tree/f267e1dca6/html/webappapis/atob
23-
- html/webappapis/microtask-queuing: https://github.com/web-platform-tests/wpt/tree/2c5c3c4c27/html/webappapis/microtask-queuing
24-
- html/webappapis/structured-clone: https://github.com/web-platform-tests/wpt/tree/47d3fb280c/html/webappapis/structured-clone
25-
- html/webappapis/timers: https://github.com/web-platform-tests/wpt/tree/5873f2d8f1/html/webappapis/timers
26-
- interfaces: https://github.com/web-platform-tests/wpt/tree/a8392bd021/interfaces
27-
- performance-timeline: https://github.com/web-platform-tests/wpt/tree/94caab7038/performance-timeline
28-
- resource-timing: https://github.com/web-platform-tests/wpt/tree/22d38586d0/resource-timing
29-
- resources: https://github.com/web-platform-tests/wpt/tree/6a2f322376/resources
30-
- streams: https://github.com/web-platform-tests/wpt/tree/f8f26a372f/streams
31-
- url: https://github.com/web-platform-tests/wpt/tree/d4598eba09/url
32-
- urlpattern: https://github.com/web-platform-tests/wpt/tree/23aac92784/urlpattern
33-
- user-timing: https://github.com/web-platform-tests/wpt/tree/5ae85bf826/user-timing
34-
- wasm/jsapi: https://github.com/web-platform-tests/wpt/tree/288c467d35/wasm/jsapi
35-
- wasm/webapi: https://github.com/web-platform-tests/wpt/tree/fd1b23eeaa/wasm/webapi
36-
- web-locks: https://github.com/web-platform-tests/wpt/tree/10a122a6bc/web-locks
37-
- WebCryptoAPI: https://github.com/web-platform-tests/wpt/tree/03a1476844/WebCryptoAPI
38-
- webidl: https://github.com/web-platform-tests/wpt/tree/63ca529a02/webidl
39-
- webidl/ecmascript-binding/es-exceptions: https://github.com/web-platform-tests/wpt/tree/2f96fa1996/webidl/ecmascript-binding/es-exceptions
40-
- webmessaging/broadcastchannel: https://github.com/web-platform-tests/wpt/tree/6495c91853/webmessaging/broadcastchannel
41-
- webstorage: https://github.com/web-platform-tests/wpt/tree/1d2c5fb36a/webstorage
10+
Pinned upstream WPT revisions for each imported subset are recorded in
11+
[`versions.json`](./versions.json).
4212

4313
[Web Platform Tests]: https://github.com/web-platform-tests/wpt
4414
[`git node wpt`]: https://github.com/nodejs/node-core-utils/blob/main/docs/git-node.md#git-node-wpt

0 commit comments

Comments
 (0)