Commit 84604926 authored by Kai Ninomiya's avatar Kai Ninomiya Committed by Commit Bot

Update WebGPU CTS branch merge instructions

Bug: None
No-Try: True
Change-Id: I49c1e945a3052eb187546c4a42a4d1f043e34a40
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545879
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828800}
parent c6ac95b8
...@@ -25,7 +25,20 @@ instructions on performing a roll. ...@@ -25,7 +25,20 @@ instructions on performing a roll.
## How to roll the WebGPU CTS into Chromium ## How to roll the WebGPU CTS into Chromium
1. Merge the cts `main` branch into `glsl-dependent` if it hasn't been 1. Merge the cts `main` branch into `glsl-dependent` if it hasn't been
done recently (or ask kainino@ to do this). done recently (or just ask kainino@ to do this).
1. Check out the `glsl-dependent` branch in a local checkout.
1. `git merge main`, fix any immediate conflicts, and finish merge.
1. Push `glsl-dependent` to your own fork of `gpuweb/cts`.
1. Open PR from `you:glsl-dependent` to `gpuweb:glsl-dependent`.
1. Push to your fork.
1. CI may fail. Fix the branch build if needed.
1. `npm install --frozen-lockfile`
1. Fixes to make `npx grunt pre` pass.
1. Commit fixes and push to your fork.
1. Get review (specifically on the build-fix commit if any).
1. (Ideally) **don't** click the merge button. Push your branch directly to
`gpuweb:glsl-dependent` to keep the nice merge history. This will not
bypass the CI and review checks.
1. Wait for 1. Wait for
[Chromium's mirror](https://chromium.googlesource.com/external/github.com/gpuweb/cts/+log/refs/heads/glsl-dependent) [Chromium's mirror](https://chromium.googlesource.com/external/github.com/gpuweb/cts/+log/refs/heads/glsl-dependent)
to pick up the changes (_usually_ &lt;10 minutes). to pick up the changes (_usually_ &lt;10 minutes).
...@@ -45,7 +58,7 @@ instructions on performing a roll. ...@@ -45,7 +58,7 @@ instructions on performing a roll.
1. Remove any expectations for "passed unexpectedly" test variants 1. Remove any expectations for "passed unexpectedly" test variants
in `WebGPUExpectations`. in `WebGPUExpectations`.
1. Repeat until CQ passes: 1. Repeat until CQ passes:
1. Look at output of `webgpu_blink_web_tests` on all bots 1. Look at output of `webgpu_blink_web_tests` on all bots.
1. Look at the output of `webgpu_blink_web_tests` (and related) 1. Look at the output of `webgpu_blink_web_tests` (and related)
on any failing bots. on any failing bots.
1. Add `WebGPUExpectations` lines for any test variants that 1. Add `WebGPUExpectations` lines for any test variants that
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment