Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-3c34a957b5

.github/workflows/turborepo-top-issues.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   run:
-    # if: github.repository_owner == 'vercel'
+    # if: github.repository_owner == 'khulnasoft'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

crates/turborepo-lib/build.rs

@@ -1,29 +1,21 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let tonic_build_result = tonic_build::configure()
-        .build_server(true)
-        .file_descriptor_set_path("src/daemon/file_descriptor_set.bin")
-        .compile(
-            &["./src/daemon/proto/turbod.proto"],
-            &["./src/daemon/proto"],
-        );
+    tonic_build::configure()
+        .protoc_arg("--experimental_allow_proto3_optional")
+        .compile(&["src/daemon/proto/turbod.proto"], &["src/daemon/proto"])?;
+
     let capnpc_result = capnpc::CompilerCommand::new()
         .file("./src/hash/proto.capnp")
         .default_parent_module(vec!["hash".to_string()])
         .run();
 
     let invocation = std::env::var("RUSTC_WRAPPER").unwrap_or_default();
     if invocation.ends_with("rust-analyzer") {
-        if tonic_build_result.is_err() {
-            println!("cargo:warning=tonic_build failed, but continuing with rust-analyzer");
-        }
-
         if capnpc_result.is_err() {
             println!("cargo:warning=capnpc failed, but continuing with rust-analyzer");
         }
 
         return Ok(());
     } else {
-        tonic_build_result.expect("tonic_build command");
         capnpc_result.expect("schema compiler command");
     }
 

packages/prysk/index.mjs

@@ -1,4 +1,4 @@
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import path from "node:path";
 
 // TODO: make this customizable?
@@ -12,13 +12,13 @@ process.env.NO_UPDATE_NOTIFIER = 1;
 const isWindows = process.platform === "win32";
 
 // Make virtualenv
-execSync(`python3 -m venv ${VENV_NAME}`);
+execFileSync("python3", ["-m", "venv", VENV_NAME]);
 
 // Upgrade pip
-execSync(`${getVenvBin("python3")} -m pip install --quiet --upgrade pip`);
+execFileSync(getVenvBin("python3"), ["-m", "pip", "install", "--quiet", "--upgrade", "pip"]);
 
 // Install prysk
-execSync(`${getVenvBin("pip")} install "prysk==0.15.2"`);
+execFileSync(getVenvBin("pip"), ["install", "prysk==0.15.2"]);
 
 // Which tests do we want to run?
 const testArg = process.argv[3] ? process.argv[3] : process.argv[2];
@@ -34,11 +34,12 @@ const flags = [
   isWindows ? "--dos2unix" : "",
 ].join(" ");
 
-const cmd = [getVenvBin("prysk"), flags, tests].join(" ");
-console.log(`Running ${cmd}`);
+const cmd = getVenvBin("prysk");
+const args = [...flags.split(" "), tests];
+console.log(`Running ${cmd} ${args.join(" ")}`);
 
 try {
-  execSync(cmd, { stdio: "inherit", env: process.env });
+  execFileSync(cmd, args, { stdio: "inherit", env: process.env });
 } catch (e) {
   // Swallow the node error stack trace. stdio: inherit should
   // already have the test failures printed. We don't need the Node.js