[infra] Use "mod download" and "install", not "get" in chrome_release…

…_branch

Change-Id: I96bc057df6b538138827fac7129126381038656a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258240
Reviewed-by: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

go.mod

@@ -7,6 +7,6 @@ require (
 	github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/uuid v1.1.1
-	go.skia.org/infra v0.0.0-20191204112307-6a511fedc008
+	go.skia.org/infra v0.0.0-20191205170533-8892bdf67fe1
 	google.golang.org/api v0.11.0
 )

go.sum

@@ -107,6 +107,7 @@ github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblf
 github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.0 h1:G8O7TerXerS4F6sx9OV7/nRfJdnXgHZu/S/7F2SN+UE=
 github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -330,6 +331,7 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
 github.com/yosuke-furukawa/json5 v0.1.1/go.mod h1:sw49aWDqNdRJ6DYUtIQiaA3xyj2IL9tjeNYmX2ixwcU=
 github.com/zeebo/bencode v1.0.0 h1:zgop0Wu1nu4IexAZeCZ5qbsjU4O1vMrfCrVgUjbHVuA=
 github.com/zeebo/bencode v1.0.0/go.mod h1:Ct7CkrWIQuLWAy9M3atFHYq4kG9Ao/SsY5cdtCXmp9Y=
+go.chromium.org/gae v0.0.0-20190826183307-50a499513efa h1:1Ia0zTIyW9IktCoEQOHPqlBsohu5n/Vzqmupj4B4tqg=
 go.chromium.org/gae v0.0.0-20190826183307-50a499513efa/go.mod h1:ypuIZj/TmtaQgUYPNNu0iKlsUkuv10PROeqHCNrqrog=
 go.chromium.org/luci v0.0.0-20191015220223-dd3644d64ff9 h1:tOzif5IkoxTlP+wYE08zK/ZWucKBt1/tJu6khA6hDGM=
 go.chromium.org/luci v0.0.0-20191015220223-dd3644d64ff9/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
@@ -347,6 +349,8 @@ go.skia.org/infra v0.0.0-20191118172813-369d64620dd4 h1:HYGJDLo9khjz74w0/TL7ZbfH
 go.skia.org/infra v0.0.0-20191118172813-369d64620dd4/go.mod h1:JDrWsoT8J2u38m70kr1/K7W7OVaDX9KbMGlDMKSL2sM=
 go.skia.org/infra v0.0.0-20191204112307-6a511fedc008 h1:2Go74pB/Px+N+qo2Cd1PK7z+ZgSVCmX94PtRnVUuK+g=
 go.skia.org/infra v0.0.0-20191204112307-6a511fedc008/go.mod h1:PgEMfZ1OVU5dQFV14hzkzrfqYUsjRyiq8fJrfgUGmVQ=
+go.skia.org/infra v0.0.0-20191205170533-8892bdf67fe1 h1:eTFXUYpaIAXki6CN5aP3Sk7dG/AorHl9TaRsHGNneVQ=
+go.skia.org/infra v0.0.0-20191205170533-8892bdf67fe1/go.mod h1:PgEMfZ1OVU5dQFV14hzkzrfqYUsjRyiq8fJrfgUGmVQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -446,6 +450,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w=
 golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

tools/chrome_release_branch.py

@@ -75,7 +75,8 @@ def update_infra_config(old_branch, new_branch):
     print >> sys.stderr, ('No configured git user; please run '
                           '"git config user.email <your email>".')
     sys.exit(1)
-  go.get(go.INFRA_GO+'/go/supported_branches/cmd/new-branch')
+  go.mod_download()
+  go.install(go.INFRA_GO+'/go/supported_branches/cmd/new-branch')
   subprocess.check_call(['new-branch',
                          '--branch', new_branch[len(REFS_HEADS_PREFIX):],
                          '--delete', old_branch[len(REFS_HEADS_PREFIX):],

tools/infra/go.py

@@ -39,12 +39,24 @@ def _fail(msg):
     _fail('%s not in PATH; is Golang properly installed?' % go_bin)
 
 
-def get(url):
-  '''Clone or update the given repo URL via "go get".'''
+def get(pkg):
+  '''Obtain/update the given package/module via "go get".'''
   check()
-  subprocess.check_call(['go', 'get', '-u', url])
+  subprocess.check_call(['go', 'get', '-u', pkg])
 
 
 def update_infra():
   '''Update the local checkout of the Skia infra codebase.'''
   get(INFRA_GO + '/...')
+
+
+def mod_download(*pkgs):
+  '''Run "go mod download" to obtain the given package(s).'''
+  check()
+  subprocess.check_call(['go', 'mod', 'download']+list(pkgs))
+
+
+def install(pkg):
+  '''"go install" the given package.'''
+  check()
+  subprocess.check_call(['go', 'install', pkg])