Closed Bug 1876858 Opened 1 year ago Closed 1 year ago

Update web-platform-tests to 3c357d5f61457b3c51a32929b4eab128374af2b7

Categories

(Testing :: web-platform-tests, task)

Product:
Testing
Component:
web-platform-tests
Type:
task

Tracking

(firefox124 fixed)

Status:
RESOLVED FIXED
Milestone:
124 Branch
Tracking Flags:
Tracking Status
firefox124 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

Retriggered failing web-platform-test tasks on try before final metadata update.
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase 0b0ad54f12656cdf3710c5e3b3ddd12590ac0df4 stdout: 'Auto-merging testing/web-platform/meta/fetch/api/cors/cors-keepalive.any.js.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/fetch/api/cors/cors-keepalive.any.js.ini' stderr: 'Rebasing (1/47) Rebasing (2/47) Rebasing (3/47) Rebasing (4/47) Rebasing (5/47) Rebasing (6/47) Rebasing (7/47) Rebasing (8/47) Rebasing (9/47) Rebasing (10/47) Rebasing (11/47) Rebasing (12/47) Rebasing (13/47) Rebasing (14/47) Rebasing (15/47) Rebasing (16/47) Rebasing (17/47) Rebasing (18/47) Rebasing (19/47) Rebasing (20/47) Rebasing (21/47) Rebasing (22/47) Rebasing (23/47) Rebasing (24/47) Rebasing (25/47) Rebasing (26/47) Rebasing (27/47) Rebasing (28/47) Rebasing (29/47) Rebasing (30/47) Rebasing (31/47) Rebasing (32/47) Rebasing (33/47) Rebasing (34/47) Rebasing (35/47) Rebasing (36/47) Rebasing (37/47) Rebasing (38/47) Rebasing (39/47) Rebasing (40/47) Rebasing (41/47) Rebasing (42/47) Rebasing (43/47) Rebasing (44/47) Rebasing (45/47) Rebasing (46/47) Rebasing (47/47) error: could not apply 564be14e37eec... Bug 1876858 - [wpt-sync] Update web-platform-tests to 3c357d5f61457b3c51a32929b4eab128374af2b7, a=testonly hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 564be14e37eec... Bug 1876858 - [wpt-sync] Update web-platform-tests to 3c357d5f61457b3c51a32929b4eab128374af2b7, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/9b32d8116833 [wpt-sync] Update web-platform-tests to 3c357d5f61457b3c51a32929b4eab128374af2b7, a=testonly

https://hg.mozilla.org/mozilla-central/rev/9b32d8116833

Status: NEW → RESOLVED
Closed: 1 year ago
status-firefox124: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → 124 Branch
You need to log in before you can comment on or make changes to this bug.