[plugin] fix bazel install

fluent-ci-templates · Apr 19, 2024 · 8bab31a · 8bab31a
1 parent ac5d9db
commit 8bab31a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/example/.fluentci/plugin/src/helpers.rs b/example/.fluentci/plugin/src/helpers.rs
@@ -4,7 +4,7 @@ use fluentci_pdk::dag;
 pub fn setup_bazel() -> Result<String, Error> {
     let stdout = dag()
         .pkgx()?
-        .with_exec(vec!["pkgx", "install", "bazel", "bazelisk"])?
+        .with_exec(vec!["pkgx", "install", "bazelisk"])?
         .stdout()?;
     Ok(stdout)
 }
diff --git a/example/.fluentci/plugin/src/lib.rs b/example/.fluentci/plugin/src/lib.rs
@@ -15,8 +15,13 @@ pub fn setup() -> FnResult<String> {
 pub fn test() -> FnResult<String> {
     let stdout = dag()
         .pkgx()?
-        .with_packages(vec!["bazel", "bazelisk"])?
-        .with_exec(vec!["bazelisk", "test", "//..."])?
+        .with_exec(vec![
+            "pkgx",
+            "+github.com/bazelbuild/bazelisk",
+            "bazelisk",
+            "test",
+            "//...",
+        ])?
         .stdout()?;
     Ok(stdout)
 }
@@ -25,8 +30,13 @@ pub fn test() -> FnResult<String> {
 pub fn build() -> FnResult<String> {
     let stdout = dag()
         .pkgx()?
-        .with_packages(vec!["bazel", "bazelisk"])?
-        .with_exec(vec!["bazelisk", "build", "//..."])?
+        .with_exec(vec![
+            "pkgx",
+            "+github.com/bazelbuild/bazelisk",
+            "bazelisk",
+            "build",
+            "//...",
+        ])?
         .stdout()?;
     Ok(stdout)
 }
diff --git a/plugin/src/helpers.rs b/plugin/src/helpers.rs
@@ -4,7 +4,7 @@ use fluentci_pdk::dag;
 pub fn setup_bazel() -> Result<String, Error> {
     let stdout = dag()
         .pkgx()?
-        .with_exec(vec!["pkgx", "install", "bazel", "bazelisk"])?
+        .with_exec(vec!["pkgx", "install", "bazelisk"])?
         .stdout()?;
     Ok(stdout)
 }
diff --git a/plugin/src/lib.rs b/plugin/src/lib.rs
@@ -15,8 +15,13 @@ pub fn setup() -> FnResult<String> {
 pub fn test() -> FnResult<String> {
     let stdout = dag()
         .pkgx()?
-        .with_packages(vec!["bazel", "bazelisk"])?
-        .with_exec(vec!["bazelisk", "test", "//..."])?
+        .with_exec(vec![
+            "pkgx",
+            "+github.com/bazelbuild/bazelisk",
+            "bazelisk",
+            "test",
+            "//...",
+        ])?
         .stdout()?;
     Ok(stdout)
 }
@@ -25,8 +30,13 @@ pub fn test() -> FnResult<String> {
 pub fn build() -> FnResult<String> {
     let stdout = dag()
         .pkgx()?
-        .with_packages(vec!["bazel", "bazelisk"])?
-        .with_exec(vec!["bazelisk", "build", "//..."])?
+        .with_exec(vec![
+            "pkgx",
+            "+github.com/bazelbuild/bazelisk",
+            "bazelisk",
+            "build",
+            "//...",
+        ])?
         .stdout()?;
     Ok(stdout)
 }