|
|
Created:
6 years, 7 months ago by borenet Modified:
6 years, 7 months ago CC:
chromium-reviews, tfarina Base URL:
https://chromium.googlesource.com/chromium/src.git@master Visibility:
Public. |
DescriptionChange Skia DEPS to pull from googlesource (git)
BUG=skia:1638
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270272
Patch Set 1 #
Total comments: 2
Patch Set 2 : Rebase #
Total comments: 2
Patch Set 3 : Rebase again #
Messages
Total messages: 28 (0 generated)
This should be unblocked now, since gclient should auto-delete and recover third_party/skia. Planning not to submit this until after the branch. I'll update skia_revision before submitting so that the new git revision corresponds with the old svn revision on DEPS, so that there's no code change.
https://codereview.chromium.org/275893002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/275893002/diff/1/DEPS#newcode159 DEPS:159: "src/third_party/skia": skia_hash?
https://codereview.chromium.org/275893002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/275893002/diff/1/DEPS#newcode159 DEPS:159: "src/third_party/skia": Ignore this - didn't notice the renaming above.
The patch is failing to apply on my trybot. It looks like it's because it's using a base revision from two days ago: __main__.SubprocessFailed: apply_issue --root_dir src --issue 275893002 --patchset 1 --no-auth --server https://codereview.chromium.org --base_ref ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 --force --ignore_deps failed with code 1 in /mnt/scratch0/b_used/build/slave/linux/build after 3 attempts. $ git show -s ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 commit ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 Author: tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Wed May 7 02:13:20 2014 +0000 ... Why would this be?
On 2014/05/09 14:32:44, borenet wrote: > The patch is failing to apply on my trybot. It looks like it's because it's > using a base revision from two days ago: > __main__.SubprocessFailed: apply_issue --root_dir src --issue 275893002 > --patchset 1 --no-auth --server https://codereview.chromium.org --base_ref > ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 --force --ignore_deps failed with code > 1 in /mnt/scratch0/b_used/build/slave/linux/build after 3 attempts. > > $ git show -s ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 > commit ab8c365e2c1c1ecb1ebabd66859d94779d1efb18 > Author: mailto:tonyg@chromium.org > <mailto:tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> > Date: Wed May 7 02:13:20 2014 +0000 > ... > > Why would this be? Ah, because it's using LKGR, which is old. I manually triggered a run on the same bot, which succeeds in both applying the patch and syncing. Looks like the gclient change is working: """ [0:01:37] _____ Conflicting directory found in /mnt/scratch0/b_used/build/slave/linux/build/src/third_party/skia. Removing. """
Now that we're past the branch point, I'd like to land this tomorrow morning (East coast). Any objections?
On 2014/05/12 20:15:22, borenet wrote: > Now that we're past the branch point, I'd like to land this tomorrow morning > (East coast). Any objections? No objections from me (lgtm), but I'd definitely poke the trooper/sheriff to keep them on the lookout.
On 2014/05/13 01:18:46, iannucci wrote: > On 2014/05/12 20:15:22, borenet wrote: > > Now that we're past the branch point, I'd like to land this tomorrow morning > > (East coast). Any objections? > > No objections from me (lgtm), but I'd definitely poke the trooper/sheriff to > keep them on the lookout. Though, if it's 'morning' enough there may not be a sheriff/trooper for an hour or three.
lgtm
The CQ bit was checked by borenet@google.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/borenet@google.com/275893002/20001
+vabr +phajdan
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are real, and report flakes to chrome-troopers@google.com. The failing builders are: android_aosp on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...) android_clang_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...) android_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...) linux_chromium_chromeos_clang_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...) mac_chromium_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...) win_chromium_compile_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...) win_chromium_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...) win_chromium_x64_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: android_clang_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
The CQ bit was checked by borenet@google.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/borenet@google.com/275893002/20001
Good luck! \o/ Thanks for your hard work. I'll follow shortly with switching over FFmpeg if this goes well.
https://codereview.chromium.org/275893002/diff/20001/DEPS File DEPS (right): https://codereview.chromium.org/275893002/diff/20001/DEPS#newcode49 DEPS:49: "skia_revision": "eaa674987f99687c0bfa337eaa27f00ffe3faa4b", s/skia_revision/skia_hash? or skia_sha1?
On 2014/05/13 18:23:53, tfarina wrote: > https://codereview.chromium.org/275893002/diff/20001/DEPS > File DEPS (right): > > https://codereview.chromium.org/275893002/diff/20001/DEPS#newcode49 > DEPS:49: "skia_revision": "eaa674987f99687c0bfa337eaa27f00ffe3faa4b", > s/skia_revision/skia_hash? or skia_sha1? Probably a good idea, but this is technically not incorrect (https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html#def_revision). hash is probably better though (https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html#def_hash)
https://codereview.chromium.org/275893002/diff/20001/DEPS File DEPS (right): https://codereview.chromium.org/275893002/diff/20001/DEPS#newcode49 DEPS:49: "skia_revision": "eaa674987f99687c0bfa337eaa27f00ffe3faa4b", On 2014/05/13 18:23:53, tfarina wrote: > s/skia_revision/skia_hash? or skia_sha1? I'd like to leave it as "skia_revision" for now, for consistency (angle_revision and swarming_revision) and since that's what the AutoRoll bot expects. In the future it may make sense to rename them for clarity.
The CQ bit was unchecked by borenet@google.com
The CQ bit was checked by borenet@google.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/borenet@google.com/275893002/20001
The CQ bit was checked by borenet@google.com
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/borenet@google.com/275893002/40001
Message was sent while issue was closed.
Change committed as 270272
Message was sent while issue was closed.
On 2014/05/14 00:39:24, I haz the power (commit-bot) wrote: > Change committed as 270272 Reverted in https://codereview.chromium.org/272003004/ |