There is no runner anymore

enso-org · Jul 4, 2024 · 3fb6a1b · 3fb6a1b
1 parent 13cb3d4
commit 3fb6a1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/build/build/paths.yaml b/build/build/paths.yaml
@@ -123,7 +123,6 @@
       bench-report.xml:
   build.sbt:
   run:
-  runner: # The runner native image (Linux only).
   CHANGELOG.md:
 
 # Launcher Package

diff --git a/build/build/src/engine/context.rs b/build/build/src/engine/context.rs
@@ -483,7 +483,15 @@ impl RunContext {
         if self.config.build_native_runner {
             debug!("Building and testing native engine runners");
             runner_sanity_test(&self.repo_root, None).await?;
-            ide_ci::fs::remove_file_if_exists(&self.repo_root.runner)?;
+            let filename = format!("enso{}", if TARGET_OS == OS::Windows { ".bat" } else { "" });
+            let enso = self
+                .repo_root
+                .built_distribution
+                .enso_engine_triple
+                .engine_package
+                .bin
+                .join(filename);
+            ide_ci::fs::remove_file_if_exists(&enso)?;
             if self.config.build_espresso_runner {
                 let enso_java = "espresso";
                 sbt.command()?
@@ -636,7 +644,10 @@ pub async fn runner_sanity_test(
     // The engine package is necessary for running the native runner.
     ide_ci::fs::tokio::require_exist(engine_package).await?;
     if enso_java.is_none() {
-        let test_base = Command::new(&repo_root.runner)
+        let filename = format!("enso{}", if TARGET_OS == OS::Windows { ".bat" } else { "" });
+        let enso =
+            repo_root.built_distribution.enso_engine_triple.engine_package.bin.join(filename);
+        let test_base = Command::new(&enso)
             .args(["--run", repo_root.test.join("Base_Tests").as_str()])
             .set_env_opt(ENSO_JAVA, enso_java)?
             .set_env(ENSO_DATA_DIRECTORY, engine_package)?