pw_env_setup: Get bazelisk instead of bazel

Get bazelisk-as-bazel instead of bazel in environment setup. This is a Bazelisk executable named 'bazel', so it's a drop-in replacement for Bazel. Bug: 355438774 Change-Id: I30075031ce3d5eb12cd5af9305d7404c28fd790d Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/226376 Reviewed-by: Armando Montanez <[email protected]> Commit-Queue: Rob Mohr <[email protected]> Reviewed-by: Keir Mierle <[email protected]> Presubmit-Verified: CQ Bot Account <[email protected]> Reviewed-by: Wyatt Hepler <[email protected]> Lint: Lint 🤖 <[email protected]>
google · Aug 19, 2024 · 284648a · 284648a
1 parent f788ed4
commit 284648a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 15 deletions.
diff --git a/pw_env_setup/py/cipd_setup_update_test.py b/pw_env_setup/py/cipd_setup_update_test.py
@@ -149,8 +149,9 @@ def test_all_package_files(self) -> None:
 
         upstream_load_order = [
             Path('upstream.json'),
-            Path('bazel.json'),
+            Path('bazelisk.json'),
             Path('buildifier.json'),
+            Path('openjdk.json'),
             Path('cmake.json'),
             Path('coverage.json'),
             Path('default.json'),

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json b/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
@@ -1,6 +1,7 @@
 {
   "included_files": [
-    "buildifier.json"
+    "buildifier.json",
+    "openjdk.json"
   ],
   "packages": [
     {
@@ -15,18 +16,6 @@
         "version:[email protected]"
       ],
       "version_file": ".versions/bazel.version"
-    },
-    {
-      "path": "flutter/java/openjdk/${platform}",
-      "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "mac-arm64",
-        "windows-amd64"
-      ],
-      "tags": [
-        "version:17"
-      ]
     }
   ]
 }
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/bazelisk.json b/pw_env_setup/py/pw_env_setup/cipd_setup/bazelisk.json
@@ -0,0 +1,21 @@
+{
+  "included_files": [
+    "buildifier.json",
+    "openjdk.json"
+  ],
+  "packages": [
+    {
+      "path": "fuchsia/third_party/bazelisk-as-bazel/${platform}",
+      "platforms": [
+        "linux-amd64",
+        "mac-amd64",
+        "mac-arm64",
+        "windows-amd64"
+      ],
+      "tags": [
+        "version:[email protected]"
+      ],
+      "version_file": ".versions/bazelisk-as-bazel.version"
+    }
+  ]
+}
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/openjdk.json b/pw_env_setup/py/pw_env_setup/cipd_setup/openjdk.json
@@ -0,0 +1,16 @@
+{
+  "packages": [
+    {
+      "path": "flutter/java/openjdk/${platform}",
+      "platforms": [
+        "linux-amd64",
+        "mac-amd64",
+        "mac-arm64",
+        "windows-amd64"
+      ],
+      "tags": [
+        "version:17"
+      ]
+    }
+  ]
+}
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/upstream.json b/pw_env_setup/py/pw_env_setup/cipd_setup/upstream.json
@@ -1,6 +1,6 @@
 {
   "included_files": [
-    "bazel.json",
+    "bazelisk.json",
     "cmake.json",
     "coverage.json",
     "default.json",