commit | 360cacde80f57b5741e6ea8925ebf0eed937d1d4 | [log] [tgz] |
---|---|---|
author | ricow@google.com <ricow@google.com> | Fri Jul 04 06:46:51 2014 +0000 |
committer | ricow@google.com <ricow@google.com> | Wed May 27 14:04:31 2015 -0700 |
tree | 8decfe93f0567330eac85785387fb68d2590a8a2 | |
parent | e9b6770d20c8cba45c8b067d28793440bb182e55 [diff] |
Version 1.5.4 svn merge -c 37258 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5 svn merge -c 37262 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5 svn merge -c 37267 https://dart.googlecode.com/svn/branches/bleeding_edge 1.5 R=kasperl@google.com Review URL: https://codereview.chromium.org//370673003 git-svn-id: http://dart.googlecode.com/svn/branches/1.5@37998 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/tools/VERSION b/tools/VERSION index 968b1c7..45dbca7 100644 --- a/tools/VERSION +++ b/tools/VERSION
@@ -26,6 +26,6 @@ CHANNEL stable MAJOR 1 MINOR 5 -PATCH 3 +PATCH 4 PRERELEASE 0 PRERELEASE_PATCH 0
diff --git a/tools/bots/dartium_android.py b/tools/bots/dartium_android.py index e10afd5..18bc171 100644 --- a/tools/bots/dartium_android.py +++ b/tools/bots/dartium_android.py
@@ -40,7 +40,9 @@ def UploadAPKs(options): with bot.BuildStep('Upload apk'): revision = utils.GetSVNRevision() - namer = bot_utils.GCSNamer() + bot_name = os.environ.get("BUILDBOT_BUILDERNAME") + channel = bot_utils.GetChannelFromName(bot_name) + namer = bot_utils.GCSNamer(channel=channel) gsutil = bot_utils.GSUtil() web_link_prefix = 'https://storage.cloud.google.com/'