Closed Bug 1820704 Opened 2 years ago Closed 2 years ago

Update web-platform-tests to bca2485f6628394a664fa348d2a7ced24d1adf57

Categories

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

task

Tracking

(firefox112 fixed)

RESOLVED FIXED
112 Branch
Tracking Status
firefox112 --- fixed

People

(Reporter: wpt-sync, Unassigned)

References

Details

(Whiteboard: [wptsync landing])

Retriggered failing web-platform-test tasks on try before final metadata update.
Whiteboard: [wptsync landing] → [wptsync landing error]
Landing failed due to conficts during rebase This requires fixup from a wpt sync admin.
Rebasing onto latest gecko failed: Cmd('git') failed due to: exit code(1) cmdline: git rebase 23389ceaffc97e247886080d5e957fa763102705 stdout: 'Auto-merging testing/web-platform/meta/css/mediaqueries/mq-non-matching-lazy-load.tentative.html.ini CONFLICT (content): Merge conflict in testing/web-platform/meta/css/mediaqueries/mq-non-matching-lazy-load.tentative.html.ini' stderr: 'Rebasing (1/12) Rebasing (2/12) Rebasing (3/12) Rebasing (4/12) Rebasing (5/12) Rebasing (6/12) Rebasing (7/12) Rebasing (8/12) Rebasing (9/12) Rebasing (10/12) Rebasing (11/12) Rebasing (12/12) error: could not apply 42a559d9ea0e0... Bug 1820704 - [wpt-sync] Update web-platform-tests to bca2485f6628394a664fa348d2a7ced24d1adf57, 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 42a559d9ea0e0... Bug 1820704 - [wpt-sync] Update web-platform-tests to bca2485f6628394a664fa348d2a7ced24d1adf57, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/a7d65f2ef13b [wpt-sync] Update web-platform-tests to bca2485f6628394a664fa348d2a7ced24d1adf57, a=testonly
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → 112 Branch
Whiteboard: [wptsync landing error] → [wptsync landing]
Regressions: 1821327
Regressions: 1821385
Regressions: 1821047
No longer regressions: 1821047
Regressions: 1821846
Regressions: 1822423
You need to log in before you can comment on or make changes to this bug.