Open Bug 2055106 Opened 1 day ago Updated 24 minutes ago

Update web-platform-tests to 0fb6a32ac631eb62d3ab70fdfd2061d79ab25675

Categories

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

task

Tracking

(firefox154 affected)

REOPENED
154 Branch
Tracking Status
firefox154 --- affected

People

(Reporter: wpt-sync, Unassigned)

References

(Blocks 25 open bugs)

Details

(Whiteboard: [wptsync landing error])

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 31ea4948e04a2e8565190a5beb20fc3f2b90dca8
stdout: 'Auto-merging testing/web-platform/meta/css/css-overscroll-behavior/overscroll-behavior.html.ini
CONFLICT (content): Merge conflict in testing/web-platform/meta/css/css-overscroll-behavior/overscroll-behavior.html.ini'
stderr: 'Rebasing (1/36)
Rebasing (2/36)
Rebasing (3/36)
Rebasing (4/36)
Rebasing (5/36)
Rebasing (6/36)
Rebasing (7/36)
Rebasing (8/36)
Rebasing (9/36)
Rebasing (10/36)
Rebasing (11/36)
Rebasing (12/36)
Rebasing (13/36)
Rebasing (14/36)
Rebasing (15/36)
Rebasing (16/36)
Rebasing (17/36)
Rebasing (18/36)
Rebasing (19/36)
Rebasing (20/36)
Rebasing (21/36)
Rebasing (22/36)
Rebasing (23/36)
Rebasing (24/36)
Rebasing (25/36)
Rebasing (26/36)
Rebasing (27/36)
Rebasing (28/36)
Rebasing (29/36)
Rebasing (30/36)
Rebasing (31/36)
Rebasing (32/36)
Rebasing (33/36)
Rebasing (34/36)
Rebasing (35/36)
Rebasing (36/36)
error: could not apply 9df5eede8fa4d... Bug 2055106 - [wpt-sync] Update web-platform-tests to 0fb6a32ac631eb62d3ab70fdfd2061d79ab25675, 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 9df5eede8fa4d... Bug 2055106 - [wpt-sync] Update web-platform-tests to 0fb6a32ac631eb62d3ab70fdfd2061d79ab25675, a=testonly'

Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase This requires fixup from a wpt sync admin.
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
Pushed by wptsync@mozilla.com: https://github.com/mozilla-firefox/firefox/commit/8284a66f2d5b https://hg.mozilla.org/integration/autoland/rev/8dc4f0bb5d34 [wpt-sync] Update web-platform-tests to 0fb6a32ac631eb62d3ab70fdfd2061d79ab25675, a=testonly
Flags: needinfo?(james)
Flags: needinfo?(aborovova)
Status: NEW → RESOLVED
Closed: 13 hours ago
Resolution: --- → FIXED
Target Milestone: --- → 154 Branch
Whiteboard: [wptsync landing error] → [wptsync landing]
Whiteboard: [wptsync landing] → [wptsync landing error]
Status: RESOLVED → REOPENED
Flags: needinfo?(aborovova)
Resolution: FIXED → ---
You need to log in before you can comment on or make changes to this bug.