commit d4260beae8c08c77390c9ca632523bb0466f24fd
author Rob Mohr <mohrr@google.com> Thu Sep 15 23:37:52 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 15 23:37:52 2022 +0000
tree 99b1d4ec9c9681dc1288f897bac10e3fe5a90f24
parent 8e2a79e0bec7c18599970607b8291d889fa569bf

pw_env_setup: Use ${platform} path in compat CIPD

Use '${platform}' instead of more specific paths in the
compatibility.json CIPD file.

Bug: b/246971220
Change-Id: I58f9448eaa8669c338ee198c730ac6c4e23f629c
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/110531
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>

pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json b/pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json
index 6d771ef..97150cf 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json
@@ -1,7 +1,7 @@
 {
   "packages": [
     {
-      "path": "infra/3pp/tools/cpython3/${os}-${arch=amd64}",
+      "path": "infra/3pp/tools/cpython3/${platform}",
       "platforms": [
         "linux-amd64",
         "linux-arm64",
@@ -14,7 +14,7 @@
       ]
     },
     {
-      "path": "pigweed/third_party/gcc-arm-none-eabi/${os}-${arch=amd64}",
+      "path": "pigweed/third_party/gcc-arm-none-eabi/${platform}",
       "platforms": [
         "linux-amd64",
         "mac-amd64",