Skip to content

tools: avoid test/fixtures/wpt/README.md conflicts#63938

Closed
panva wants to merge 1 commit into
nodejs:mainfrom
panva:avoid-fixtures-wpt-readme-conflicts
Closed

tools: avoid test/fixtures/wpt/README.md conflicts#63938
panva wants to merge 1 commit into
nodejs:mainfrom
panva:avoid-fixtures-wpt-readme-conflicts

Conversation

@panva

@panva panva commented Jun 16, 2026

Copy link
Copy Markdown
Member

This PR avoids concurrent automated WPT updates from running into a conflict - e.g. this week's #63898 and #63899

I'll follow up with an update to @node-core/utils to stop generating updates for this file.

cc @nodejs/web-standards

Refs: nodejs/node-core-utils#1094

@panva panva requested a review from aduh95 June 16, 2026 08:35
@nodejs-github-bot

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/actions
  • @nodejs/web-standards

@nodejs-github-bot nodejs-github-bot added meta Issues and PRs related to the general management of the project. needs-ci PRs that need a full CI run. labels Jun 16, 2026
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
@aduh95 aduh95 added lts-watch-v22.x PRs that may need to be released in v22.x author ready PRs that have at least one approval, no pending requests for changes, and a CI started. labels Jun 16, 2026
@panva panva removed the needs-ci PRs that need a full CI run. label Jun 16, 2026
@panva panva added the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 16, 2026
@nodejs-github-bot nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Jun 18, 2026
@nodejs-github-bot

Copy link
Copy Markdown
Collaborator
Commit Queue failed
- Loading data for nodejs/node/pull/63938
✔  Done loading data for nodejs/node/pull/63938
----------------------------------- PR info ------------------------------------
Title      tools: avoid test/fixtures/wpt/README.md conflicts (#63938)
Author     Filip Skokan <panva.ip@gmail.com> (@panva)
Branch     panva:avoid-fixtures-wpt-readme-conflicts -> nodejs:main
Labels     meta, author ready, lts-watch-v22.x
Commits    1
 - tools: avoid test/fixtures/wpt/README.md conflicts
Committers 1
 - Filip Skokan <panva.ip@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/63938
Refs: https://github.com/nodejs/node-core-utils/pull/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>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/63938
Refs: https://github.com/nodejs/node-core-utils/pull/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>
--------------------------------------------------------------------------------
   ℹ  This PR was created on Tue, 16 Jun 2026 08:35:54 GMT
   ✔  Approvals: 7
   ✔  - Antoine du Hamel (@aduh95) (TSC): https://github.com/nodejs/node/pull/63938#pullrequestreview-4504697609
   ✔  - Mattias Buelens (@MattiasBuelens): https://github.com/nodejs/node/pull/63938#pullrequestreview-4505073432
   ✔  - Yagiz Nizipli (@anonrig) (TSC): https://github.com/nodejs/node/pull/63938#pullrequestreview-4506893543
   ✔  - Daijiro Wachi (@watilde): https://github.com/nodejs/node/pull/63938#pullrequestreview-4507077499
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/63938#pullrequestreview-4509796279
   ✔  - Ethan Arrowood (@Ethan-Arrowood): https://github.com/nodejs/node/pull/63938#pullrequestreview-4514929430
   ✔  - Daeyeon Jeong (@daeyeon): https://github.com/nodejs/node/pull/63938#pullrequestreview-4523110867
   ✔  Last GitHub CI successful
   ✘  No Jenkins CI runs detected
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu
https://github.com/nodejs/node/actions/runs/27750777934

panva added a commit that referenced this pull request Jun 18, 2026
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #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>
@panva

panva commented Jun 18, 2026

Copy link
Copy Markdown
Member Author

Landed in d1ff9a0

@panva panva closed this Jun 18, 2026
@panva panva removed the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Jun 18, 2026
@panva panva deleted the avoid-fixtures-wpt-readme-conflicts branch June 18, 2026 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. lts-watch-v22.x PRs that may need to be released in v22.x meta Issues and PRs related to the general management of the project.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants