Allow passing options to scala-cli via language plugin executor (#503)

* add BESOM_LANGHOST_SCALA_CLI_OPTS env var handling to scala-cli langhost executor * disable bloop in CI jobs
VirtusLab · May 24, 2024 · 85d55d4 · 85d55d4
1 parent 7a0c24a
commit 85d55d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,8 @@ jobs:
   build:
     if: "! github.event.pull_request.head.repo.fork"
     runs-on: ubuntu-latest
+    env:
+      BESOM_LANGHOST_SCALA_CLI_OPTS: "--server=false"
     timeout-minutes: 45
     steps:
     - uses: actions/checkout@v4

diff --git a/language-plugin/pulumi-language-scala/executors/executor_scala_cli.go b/language-plugin/pulumi-language-scala/executors/executor_scala_cli.go
@@ -3,6 +3,8 @@
 package executors
 
 import (
+	"os"
+
 	"github.com/virtuslab/besom/language-host/fsys"
 )
 
@@ -23,12 +25,13 @@ func (s scalacli) NewScalaExecutor(opts ScalaExecutorOptions) (*ScalaExecutor, e
 }
 
 func (scalacli) newScalaCliExecutor(cmd string, bootstrapLibJarPath string) (*ScalaExecutor, error) {
+	scalaCliOpts := os.Getenv("BESOM_LANGHOST_SCALA_CLI_OPTS")
 	return &ScalaExecutor{
 		Name:        "scala-cli",
 		Cmd:         cmd,
-		BuildArgs:   []string{"compile", "."},
-		RunArgs:     []string{"run", "."},
-		PluginArgs:  []string{"run", ".", "--jar", bootstrapLibJarPath, "--main-class", "besom.bootstrap.PulumiPluginsDiscoverer"},
+		BuildArgs:   []string{"compile", ".", scalaCliOpts},
+		RunArgs:     []string{"run", ".", scalaCliOpts},
+		PluginArgs:  []string{"run", ".", scalaCliOpts, "--jar", bootstrapLibJarPath, "--main-class", "besom.bootstrap.PulumiPluginsDiscoverer"},
 		VersionArgs: []string{"version", "--cli", "--offline"},
 	}, nil
 }