Back to build
Raw log | Switch to full mode | Login

{ "did_run": true, "failed_patch_body": "Looking for .gclient starting from e:\\b\\swarm_slave\\w\\ir\\cache\\builder\n\nLoaded .gclient config in e:\\b\\swarm_slave\\w\\ir\\cache\\builder:\nsolutions = [ { 'custom_vars': { 'dawn_root': 'dawn'},\n 'deps_file': '.DEPS.git',\n 'managed': False,\n 'name': 'dawn',\n 'url': 'https://dawn.googlesource.com/dawn.git'}]\n\ncache_dir = r\"e:\\\\b\\\\swarm_slave\\\\w\\\\ir\\\\cache\\\\git\"\n\n\ntarget_os_only=False\n\n\n\ndawn\n----------------------------------------\n[0:00:00] Started.\n_____ dawn at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping dawn\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\\\b\\\\swarm_slave\\\\w\\\\ir\\\\cache\\\\builder\\\\dawn'\n[0:00:01] Merge base of refs/remotes/origin/master and ce956aa33d60a7eca633ae3efa56e8537bf7830a is 0da9494a4fe9aa89e1a3b2d911719d150a2d963e\n[0:00:02] Failed to apply patch.\n[0:00:02] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\\\b\\\\swarm_slave\\\\w\\\\ir\\\\cache\\\\builder\\\\dawn'\n[0:00:02] git returned non-zero exit status 1:\nerror: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n[0:00:02] HEAD detached from origin/master\nYou are currently cherry-picking commit baec811.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: src/dawn_native/metal/DeviceMTL.mm\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n----------------------------------------\n\ndawn (ERROR)\n----------------------------------------\n[0:00:00] Started.\n_____ dawn at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping dawn\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\\\b\\\\swarm_slave\\\\w\\\\ir\\\\cache\\\\builder\\\\dawn'\n[0:00:01] Merge base of refs/remotes/origin/master and ce956aa33d60a7eca633ae3efa56e8537bf7830a is 0da9494a4fe9aa89e1a3b2d911719d150a2d963e\n[0:00:02] Failed to apply patch.\n[0:00:02] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\\\b\\\\swarm_slave\\\\w\\\\ir\\\\cache\\\\builder\\\\dawn'\n[0:00:02] git returned non-zero exit status 1:\nerror: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n[0:00:02] HEAD detached from origin/master\nYou are currently cherry-picking commit baec811.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: src/dawn_native/metal/DeviceMTL.mm\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n----------------------------------------\nError: Command 'git cherry-pick 0da9494a4fe9aa89e1a3b2d911719d150a2d963e..ce956aa33d60a7eca633ae3efa56e8537bf7830a --keep-redundant-commits' returned non-zero exit status 1 in e:\\b\\swarm_slave\\w\\ir\\cache\\builder\\dawn\n[detached HEAD ed67dd1] Factor SerialQueue into SerialQueue and SerialMap\n Author: Austin Eng <enga@chromium.org>\n Date: Wed Nov 28 09:12:41 2018 -0800\n\nerror: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n", "fixed_revisions": { "dawn": "HEAD" }, "patch_apply_return_code": 1, "patch_failure": true, "patch_root": "dawn", "root": "dawn", "step_text": "[22GB/249GB used (8%)] PATCH FAILED" }