Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Issue 2356483003: Roll recipe dependencies (trivial). (Closed)

Created:
4 years, 3 months ago by recipe-roller
Modified:
4 years, 3 months ago
CC:
chromium-reviews
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug (or complain) build: https://crrev.com/c731a26b214ed6e743460469385b53bb3cc34228 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) https://crrev.com/4654e248929bffb7eee1df0ba851f608dbe6eee1 Roll recipe dependencies (trivial). (recipe-roller@chromium.org) https://crrev.com/8cde6a2835f03e5bf18e1bd8e84e8421dc206495 Revert of Changed sequence of package_build step (patchset #2 id:20001 of https://codereview.chromium.org/2335383002/ ) (dtu@chromium.org) depot_tools: https://crrev.com/9eadede7df2fb30f25edf64e378b129c88efdfb6 Add ability to set topic during "git cl upload" (rmistry@google.com) https://crrev.com/8ea74908a6b6f9ec1ab1a8333d40b54cef0f6f19 depot_tools: Remove third_party/gsutil (hinoka@google.com) TBR=martiniss@chromium.org,phajdan.jr@chromium.org BUG=645662, chromium:628237 Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2 lines, -2 lines) Patch
M infra/config/recipes.cfg View 1 chunk +2 lines, -2 lines 0 comments Download

Messages

Total messages: 4 (2 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2356483003/1
4 years, 3 months ago (2016-09-19 20:02:47 UTC) #2
commit-bot: I haz the power
4 years, 3 months ago (2016-09-19 20:11:04 UTC) #4
Failed to apply patch for infra/config/recipes.cfg:
While running git apply --index -3 -p1;
  error: patch failed: infra/config/recipes.cfg:5
  Falling back to three-way merge...
  Applied patch to 'infra/config/recipes.cfg' with conflicts.
  U infra/config/recipes.cfg

Patch:       infra/config/recipes.cfg
Index: infra/config/recipes.cfg
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index
34c46603167c4bd415e1e3661e70171c7b9df6e3..8e1a8b1ff2e0964b7e70801d996a86589ee108f3
100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -5,13 +5,13 @@ deps {
   project_id: "build"
   url: "https://chromium.googlesource.com/chromium/tools/build.git"
   branch: "master"
-  revision: "4344bc8bd41f5ebd515104ad34cbd1faff669c9a"
+  revision: "8cde6a2835f03e5bf18e1bd8e84e8421dc206495"
 }
 deps {
   project_id: "depot_tools"
   url: "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
   branch: "master"
-  revision: "7e16cf303221bbcf81d632924e19ddc888da9c3b"
+  revision: "8ea74908a6b6f9ec1ab1a8333d40b54cef0f6f19"
 }
 deps {
   project_id: "recipe_engine"

Powered by Google App Engine
This is Rietveld 408576698