Closed Bug 1576813 Opened 4 months ago Closed 4 months ago

Update web-platform-tests to 23f463a0cc666d24bcb6b50ce2ab8b5deec77881

Categories

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

task
Not set

Tracking

(firefox70 fixed)

RESOLVED FIXED
mozilla70
Tracking Status
firefox70 --- fixed

People

(Reporter: wptsync, Unassigned)

References

Details

(Whiteboard: [wptsync landing error])

Attachments

(1 file, 1 obsolete file)

No description provided.
Retriggered failing web-platform-test tasks on try before final metadata update.
Rebase failed:
Cmd('git') failed due to: exit code(128)
  cmdline: git rebase 33a02c7f8c6e0567112c3d2b623359ec14947739
  stdout: 'First, rewinding head to replay your work on top of it...
Applying: Bug 1575918 [wpt PR 18616] - Fix font-variation-settings interpolation test, a=testonly
Applying: Bug 1575918 [wpt PR 18616] - Update wpt metadata, a=testonly
Using index info to reconstruct a base tree...
M	testing/web-platform/meta/css/css-fonts/animations/font-size-adjust-interpolation.html.ini
M	testing/web-platform/meta/css/css-fonts/animations/font-size-interpolation-001.html.ini
M	testing/web-platform/meta/css/css-fonts/animations/font-size-interpolation-002.html.ini
M	testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
M	testing/web-platform/meta/css/css-grid/animation/grid-template-columns-interpolation.html.ini
M	testing/web-platform/meta/css/css-grid/animation/grid-template-rows-interpolation.html.ini
M	testing/web-platform/meta/css/css-sizing/animation/width-interpolation.html.ini
M	testing/web-platform/meta/css/css-transforms/animation/list-interpolation.html.ini
A	testing/web-platform/meta/css/css-transforms/animation/matrix-interpolation.html.ini
M	testing/web-platform/meta/css/css-transforms/animation/rotate-interpolation.html.ini
M	testing/web-platform/meta/css/css-transforms/animation/scale-interpolation.html.ini
M	testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-001.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-004.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-001.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-003.html.ini
M	testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-004.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-anchor-interpolation.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-path-interpolation-001.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-path-interpolation-002.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-path-interpolation-003.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-path-interpolation-004.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-path-interpolation-005.html.ini
M	testing/web-platform/meta/css/motion/animation/offset-position-interpolation.html.ini
M	testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-tentative.html.ini
M	testing/web-platform/meta/feature-policy/experimental-features/layout-animations-enabled-tentative.html.ini
Falling back to patching base and 3-way merge...
Auto-merging testing/web-platform/meta/feature-policy/experimental-features/layout-animations-enabled-tentative.html.ini
Auto-merging testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-tentative.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-path-interpolation-005.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-path-interpolation-004.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-path-interpolation-003.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-path-interpolation-002.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-path-interpolation-001.html.ini
Auto-merging testing/web-platform/meta/css/motion/animation/offset-anchor-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-004.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-003.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/filter-interpolation-001.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-004.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini
Auto-merging testing/web-platform/meta/css/filter-effects/animation/backdrop-filter-interpolation-001.html.ini
Auto-merging testing/web-platform/meta/css/css-transforms/animation/translate-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-transforms/animation/scale-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-transforms/animation/rotate-interpolation.html.ini
CONFLICT (modify/delete): testing/web-platform/meta/css/css-transforms/animation/matrix-interpolation.html.ini deleted in HEAD and modified in Bug 1575918 [wpt PR 18616] - Update wpt metadata, a=testonly. Version Bug 1575918 [wpt PR 18616] - Update wpt metadata, a=testonly of testing/web-platform/meta/css/css-transforms/animation/matrix-interpolation.html.ini left in tree.
Auto-merging testing/web-platform/meta/css/css-transforms/animation/list-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-sizing/animation/width-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-grid/animation/grid-template-rows-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-grid/animation/grid-template-columns-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
Auto-merging testing/web-platform/meta/css/css-fonts/animations/font-size-interpolation-003.html.ini
Auto-merging testing/web-platform/meta/css/css-fonts/animations/font-size-interpolation-002.html.ini
Auto-merging testing/web-platform/meta/css/css-fonts/animations/font-size-interpolation-001.html.ini
Auto-merging testing/web-platform/meta/css/css-fonts/animations/font-size-adjust-interpolation.html.ini
Patch failed at 0002 Bug 1575918 [wpt PR 18616] - Update wpt metadata, a=testonly
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
'
  stderr: '/app/repos/gecko/worktrees/sync-landing-1576813-0/rebase-apply/patch:777: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1576813-0/rebase-apply/patch:5299: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1576813-0/rebase-apply/patch:6558: new blank line at EOF.
+
/app/repos/gecko/worktrees/sync-landing-1576813-0/rebase-apply/patch:8075: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
error: Failed to merge in the changes.'
Whiteboard: [wptsync landing] → [wptsync landing error]
Retriggered failing web-platform-test tasks on try before final metadata update.
Pushed by wptsync@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/8feea1e30794
[wpt-sync] Update web-platform-tests to 23f463a0cc666d24bcb6b50ce2ab8b5deec77881, a=testonly
Pushed by james@hoppipolla.co.uk:
https://hg.mozilla.org/integration/mozilla-inbound/rev/96c4fd9ba130
[wpt-sync] Update web-platform-tests to 23f463a0cc666d24bcb6b50ce2ab8b5deec77881, a=testonly
Regressions: 1568717
Flags: needinfo?(james)
Attachment #9088827 - Attachment is obsolete: true
You need to log in before you can comment on or make changes to this bug.