[clang_toolchain] Fix published CIPD package name
This got changed from `clang` to `clang-darwin` or `clang-linux`
accidentally during a previous refactor. The published name must
be the same on all platforms (before the `/${cipd_platform}` part).
Change-Id: Ib5278149c6584034d7362e93915db4ff1ffaf901
diff --git a/recipes/clang_toolchain.expected/prod-linux-x64.json b/recipes/clang_toolchain.expected/prod-linux-x64.json
index 1c11826..2c7c708 100644
--- a/recipes/clang_toolchain.expected/prod-linux-x64.json
+++ b/recipes/clang_toolchain.expected/prod-linux-x64.json
@@ -1619,21 +1619,21 @@
"cipd",
"pkg-build",
"-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/clang-linux.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/clang-linux/linux-amd64\", \"root\": \"[CLEANUP]/clang_tmp_1/clang-linux\"}",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/clang.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/clang/linux-amd64\", \"root\": \"[CLEANUP]/clang_tmp_1/clang-linux\"}",
"-out",
- "[CLEANUP]/clang-linux.cipd",
+ "[CLEANUP]/clang.cipd",
"-hash-algo",
"sha256",
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.build fuchsia/third_party/clang-linux/linux-amd64",
+ "name": "cipd.build fuchsia/third_party/clang/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@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\": \"fuchsia/third_party/clang-linux/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang/linux-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -1643,20 +1643,20 @@
"cmd": [
"cipd",
"search",
- "fuchsia/third_party/clang-linux/linux-amd64",
+ "fuchsia/third_party/clang/linux-amd64",
"-tag",
"git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.cipd search fuchsia/third_party/clang-linux/linux-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ "name": "cipd.cipd search fuchsia/third_party/clang/linux-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang-linux/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang/linux-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
diff --git a/recipes/clang_toolchain.expected/prod-mac-x64.json b/recipes/clang_toolchain.expected/prod-mac-x64.json
index 32a65a4..aa890ad 100644
--- a/recipes/clang_toolchain.expected/prod-mac-x64.json
+++ b/recipes/clang_toolchain.expected/prod-mac-x64.json
@@ -1679,21 +1679,21 @@
"cipd",
"pkg-build",
"-pkg-def",
- "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/clang-darwin.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/clang-darwin/mac-amd64\", \"root\": \"[CLEANUP]/clang_tmp_1/clang-darwin\"}",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/clang.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/clang/mac-amd64\", \"root\": \"[CLEANUP]/clang_tmp_1/clang-darwin\"}",
"-out",
- "[CLEANUP]/clang-darwin.cipd",
+ "[CLEANUP]/clang.cipd",
"-hash-algo",
"sha256",
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.build fuchsia/third_party/clang-darwin/mac-amd64",
+ "name": "cipd.build fuchsia/third_party/clang/mac-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@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\": \"fuchsia/third_party/clang-darwin/mac-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -1703,20 +1703,20 @@
"cmd": [
"cipd",
"search",
- "fuchsia/third_party/clang-darwin/mac-amd64",
+ "fuchsia/third_party/clang/mac-amd64",
"-tag",
"git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd.cipd search fuchsia/third_party/clang-darwin/mac-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ "name": "cipd.cipd search fuchsia/third_party/clang/mac-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang-darwin/mac-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/clang/mac-amd64\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
diff --git a/recipes/clang_toolchain.py b/recipes/clang_toolchain.py
index 1114c66..86615ee 100644
--- a/recipes/clang_toolchain.py
+++ b/recipes/clang_toolchain.py
@@ -455,6 +455,8 @@
isolated = api.upload.upload_isolated(pkg_dir)
if prod:
+ # The published package has the same name for every platform.
+ pkg_name = 'clang'
api.upload.cipd_package(
'fuchsia/third_party/%s/%s' % (pkg_name, target_platform),
pkg_dir, [api.upload.DirectoryPath(pkg_dir)],
