Use 3pp go package
Non 3pp packages are not maintained any more. This CL switches to 3pp one.
Change-Id: I6b6093a68586df6e8188d67cb85b1470659d189e
Bug: https://github.com/flutter/flutter/issues/114906
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35820
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
(cherry picked from commit 7ddf3235dfe0c64e2b69c68ce738f681313546d6)
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35841
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index d94ac93..b95ceac 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -194,10 +194,9 @@
def go_sdk(self, env, env_prefixes, version):
"""Installs go sdk."""
- version = version or 'version:1.12.5'
go_path = self.m.path['cache'].join('go')
go = self.m.cipd.EnsureFile()
- go.add_package('infra/go/${platform}', version)
+ go.add_package('infra/3pp/tools/go/${platform}', version)
self.m.cipd.ensure(go_path, go)
paths = env_prefixes.get('PATH', [])
paths.append(go_path.join('bin'))
@@ -211,11 +210,11 @@
def dashing(self, env, env_prefixes, version):
"""Installs dashing."""
version = version or 'git_revision:ed8da90e524f59c69781c8af65638f108d0bbba6'
- self.go_sdk(env, env_prefixes, 'latest')
+ self.go_sdk(env, env_prefixes, 'version:2@1.19.3')
with self.m.context(env=env, env_prefixes=env_prefixes):
self.m.step(
'Install dashing',
- ['go', 'get', '-u', 'github.com/technosophos/dashing'],
+ ['go', 'install', 'github.com/technosophos/dashing@latest'],
infra_step=True,
)
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index fb22f23..c3b9d91 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
index 942b3b2..af0f9fd 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index fb22f23..c3b9d91 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/linux.json b/recipe_modules/flutter_deps/examples/full.expected/linux.json
index fb22f23..c3b9d91 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/linux.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/linux.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
index c662361..bfc1082 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 5085a8a..21271ff 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome-mac/Chromium.app/Contents/MacOS/Chromium",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows.json b/recipe_modules/flutter_deps/examples/full.expected/windows.json
index 2a7c153..c2dc2d5 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/windows.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/windows.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]\\go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]\\go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]\\chrome\\chrome\\chrome.exe",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json b/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
index b3386b8..ce4d226 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
index ee17266..78f6963 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
@@ -134,7 +134,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} v4",
+ "infra/3pp/tools/go/${platform} v4",
"-max-threads",
"0",
"-json-output",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-v4--------------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -177,7 +177,7 @@
"-root",
"[CACHE]/go",
"-ensure-file",
- "infra/go/${platform} latest",
+ "infra/3pp/tools/go/${platform} version:2@1.19.3",
"-max-threads",
"0",
"-json-output",
@@ -189,8 +189,8 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/go/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:2@1.19.3\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/3pp/tools/go/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
@@ -216,9 +216,8 @@
{
"cmd": [
"go",
- "get",
- "-u",
- "github.com/technosophos/dashing"
+ "install",
+ "github.com/technosophos/dashing@latest"
],
"env": {
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
