commit a0108938fefa633aed04eb4282b82cd249c9bd5a
author Petr Hosek <phosek@google.com> Fri Oct 26 19:50:50 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Oct 29 20:06:42 2018 +0000
tree 9864c55693bcc14bf706a8ca78bb519b282eab37
parent bdb0fd02324b120cacde634a9235405061c8ea06

[recipe] Use ${platform} variable for CIPD

Since crbug.com/855703 has been resolved, we can use ${platform} now.

Change-Id: I78af96a53b73d4f6430cabe56618939915487519
Reviewed-on: https://gn-review.googlesource.com/c/3141
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Petr Hosek <phosek@google.com>

infra/recipes/gn.expected/ci_win.json

diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json
index dacb8eb..1d46c58 100644
--- a/infra/recipes/gn.expected/ci_win.json
+++ b/infra/recipes/gn.expected/ci_win.json
@@ -350,18 +350,18 @@
       "cipd.bat",
       "pkg-build",
       "-pkg-def",
-      "{\"data\": [{\"file\": \"gn.exe\"}, {\"version_file\": \".versions/gn.exe.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"gn/gn/windows-amd64\", \"root\": \"[START_DIR]\\\\gn\\\\out\"}",
+      "{\"data\": [{\"file\": \"gn.exe\"}, {\"version_file\": \".versions/gn.exe.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"gn/gn/${platform}\", \"root\": \"[START_DIR]\\\\gn\\\\out\"}",
       "-out",
       "[CLEANUP]\\gn.cipd",
       "-json-output",
       "/path/to/tmp/json"
     ],
-    "name": "build gn/gn/windows-amd64",
+    "name": "build gn/gn/${platform}",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"package\": \"gn/gn/windows-amd64\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"package\": \"gn/gn/${platform}\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"