Closed Bug 1878703 Opened 1 year ago Closed 1 year ago

Update web-platform-tests to 1f864a24d5764dfc89b9fc21afa2251ba67f0cc0

Categories

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

task

Tracking

(firefox124 fixed)

RESOLVED FIXED
124 Branch
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.
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 0b94c99a1d41bb2da5d3ea01564097eb5ce51810 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: 'warning: skipped previously applied commit ec5799455949d warning: skipped previously applied commit 20db865c46afc warning: skipped previously applied commit 5e6c644dc1279 warning: skipped previously applied commit 67abb0189ecfe warning: skipped previously applied commit 84ded68909a09 warning: skipped previously applied commit 1a5dbfcd7a77d warning: skipped previously applied commit aedd597e5a9d1 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/28) Rebasing (2/28) Rebasing (3/28) Rebasing (4/28) Rebasing (5/28) Rebasing (6/28) Rebasing (7/28) Rebasing (8/28) Rebasing (9/28) Rebasing (10/28) Rebasing (11/28) Rebasing (12/28) Rebasing (13/28) Rebasing (14/28) Rebasing (15/28) Rebasing (16/28) Rebasing (17/28) Rebasing (18/28) Rebasing (19/28) Rebasing (20/28) Rebasing (21/28) Rebasing (22/28) Rebasing (23/28) Rebasing (24/28) Rebasing (25/28) Rebasing (26/28) Rebasing (27/28) Rebasing (28/28) error: could not apply c954fd795ffaa... Bug 1878703 - [wpt-sync] Update web-platform-tests to 1f864a24d5764dfc89b9fc21afa2251ba67f0cc0, 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 c954fd795ffaa... Bug 1878703 - [wpt-sync] Update web-platform-tests to 1f864a24d5764dfc89b9fc21afa2251ba67f0cc0, a=testonly'
Pushed by wptsync@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/7b81e807e547 [wpt-sync] Update web-platform-tests to 1f864a24d5764dfc89b9fc21afa2251ba67f0cc0, a=testonly
Status: NEW → RESOLVED
Closed: 1 year ago
Resolution: --- → FIXED
Target Milestone: --- → 124 Branch
You need to log in before you can comment on or make changes to this bug.