|
|
Created:
6 years, 9 months ago by DaleCurtis Modified:
6 years, 7 months ago CC:
chromium-reviews, borenet2 Base URL:
svn://svn.chromium.org/chrome/trunk/src Visibility:
Public. |
DescriptionSwitch FFmpeg from svn/git-svn translation to using git directly.
Includes the deps2git roll to remove special cased ffmpeg setup.
BUG=329002
TEST=gclient sync works
R=mmoss@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271050
Patch Set 1 #
Total comments: 2
Patch Set 2 : Rebase. Remove deps2git roll. #Patch Set 3 : Add deps2git roll. #
Total comments: 1
Messages
Total messages: 19 (0 generated)
https://codereview.chromium.org/191553002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/191553002/diff/1/DEPS#newcode271 DEPS:271: "/trunk/tools/deps2git@XXXXXX-CHANGE-THIS", Strictly speaking, this doesn't have to happen atomically. deps2git is only run by an infrastructure cron job, which always floats deps2git to tip-of-tree. This change is safe to land before the deps2git change.
PTAL. borenet's gclient changes have landed, so once skia has switched over without issue I'll land this. https://codereview.chromium.org/191553002/diff/1/DEPS File DEPS (right): https://codereview.chromium.org/191553002/diff/1/DEPS#newcode271 DEPS:271: "/trunk/tools/deps2git@XXXXXX-CHANGE-THIS", On 2014/03/07 22:47:03, szager1 wrote: > Strictly speaking, this doesn't have to happen atomically. deps2git is only run > by an infrastructure cron job, which always floats deps2git to tip-of-tree. > > This change is safe to land before the deps2git change. Done.
+mmoss since it looks like he may be rolling deps2git soon.
On 2014/05/15 19:18:32, DaleCurtis wrote: > +mmoss since it looks like he may be rolling deps2git soon. Should that roll be incorporated into this? If so, you can set it to r270777.
Done.
lgtm
Hmm, looks like borenet's change got reverted since svn left a skia/ dir around. FFmpeg shouldn't have the same issues since there's no ffmpeg dir in svn repo, it's pulled from deps. I'll go ahead and CQ this and see what happens on the bots. +borenet fyi
The CQ bit was checked by dalecurtis@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/191553002/40001
Yeah, this shouldn't have all of the problems of the Skia change... https://codereview.chromium.org/191553002/diff/40001/DEPS File DEPS (right): https://codereview.chromium.org/191553002/diff/40001/DEPS#newcode216 DEPS:216: "/chromium/third_party/ffmpeg.git@d3a060bd1d6a4f43e9bc7d07f193b0513df4f244", You might consider leaving the "ffmpeg_revision" variable around in case you want to use the AutoRoll bot for DEPS rolls in the future (http://www.chromium.org/blink/blinkrollbot).
FFmpeg isn't something we want auto-rolled at this time, so I'm okay with removing it. Looks like presubmit is failing because it thinks I've checked in a change to .DEPS.git
Hmm, CQ bots don't seem to be using the new DEPS file, they're instead using the SVN checkout process; presumably from some cached DEPS file or something??
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: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
Going to land this manually since presubmit doesn't like the .DEPS.git changes that occur.
Message was sent while issue was closed.
Committed patchset #3 manually as r271050 (presubmit successful).
Message was sent while issue was closed.
Looking good so far, "Conflicting directory found in ...\third_party\ffmpeg. Removing." |