Archive SDK by git hash in addition to version number

tools/bots/dart_sdk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import os.path
 import shutil
 import sys
 import subprocess
@@ skipping 63 matching lines @@
                              utils.GetBuildRoot(BUILD_OS, 'release', 'x64'),
                              'dartsdk-%s-64.zip' % BUILD_OS)
     FileDelete(sdk32_zip)
     FileDelete(sdk64_zip)
     CreateZip(sdk32_path, sdk32_zip)
     CreateZip(sdk64_path, sdk64_zip)
     DartArchiveUploadSDKs(BUILD_OS, sdk32_zip, sdk64_zip)
 
 def DartArchiveUploadSDKs(system, sdk32_zip, sdk64_zip):
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
-  revision = utils.GetArchiveVersion()
-  for revision in [revision, 'latest']:
+  git_number = utils.GetArchiveVersion()

[kustermann, 2016/08/05 11:32:37]

Is this really a number of a semantic version? If the latter, maybe rename to
semver (or something like that).

[Bill Hesse, 2016/08/05 22:07:28]

This is a consecutive number for 'be', which I want to eliminate, and the
semantic version for 'dev' and 'stable'.

 

+  git_hash = 'hash/' + utils.GetGitRevision()

[Bill Hesse, 2016/08/05 11:28:11]

Should I use 'hash/%s' % instead of 'hash/' +?

[kustermann, 2016/08/05 11:32:37]

Yes, I think this is the "python way" of doing it normally.

+  for revision in [git_number, git_hash, 'latest']:
     path32 = namer.sdk_zipfilepath(revision, system, 'ia32', 'release')
     path64 = namer.sdk_zipfilepath(revision, system, 'x64', 'release')
     DartArchiveFile(sdk32_zip, path32, checksum_files=True)
     DartArchiveFile(sdk64_zip, path64, checksum_files=True)
 
 def DartArchiveUnstrippedBinaries():
   namer = bot_utils.GCSNamer(CHANNEL, bot_utils.ReleaseType.RAW)
   revision = utils.GetArchiveVersion()
   binary = namer.unstripped_filename(BUILD_OS)
   ia32_binary = os.path.join(bot_utils.DART_DIR,
@@ skipping 123 matching lines @@
 
 if __name__ == '__main__':
   # We always clobber the bot, to make sure releases are build from scratch
   force = CHANNEL != bot_utils.Channel.BLEEDING_EDGE
   bot.Clobber(force=force)
 
   CreateUploadSDK()
   if BUILD_OS == 'linux':
     CreateUploadVersionFile()
     CreateUploadAPIDocs()