Skip to content

Use pnpm.cmd on Windows in typescript-test #5539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rekhoff wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −13
Open

Use pnpm.cmd on Windows in typescript-test #5539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions tools/ci/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use anyhow::{bail, Result};
use clap::{CommandFactory, Parser, Subcommand};
use duct::cmd;
use duct::{cmd, Expression};
use serde_json::Value;
use std::ffi::OsStr;
use std::ffi::OsString;
Expand All @@ -20,6 +20,24 @@ mod util;

use util::ensure_repo_root;

/// On Windows, `pnpm` is installed as a `.cmd` shim which `CreateProcess` cannot
/// find without going through the shell. Wrapping with `cmd /c` fixes this.
/// On Unix, we invoke `pnpm` directly.
fn pnpm<I, S>(args: I) -> Expression
where
I: IntoIterator<Item = S>,
S: AsRef<std::ffi::OsStr>,
{
let args: Vec<std::ffi::OsString> = args.into_iter().map(|a| a.as_ref().to_os_string()).collect();
if cfg!(windows) {
let mut full: Vec<std::ffi::OsString> = vec!["/c".into(), "pnpm".into()];
full.extend(args);
cmd("cmd", full)
} else {
cmd("pnpm", args)
}
}

/// SpacetimeDB CI tasks
///
/// This tool provides several subcommands for automating CI workflows in SpacetimeDB.
Expand Down Expand Up @@ -432,9 +450,9 @@ fn run_publish_checks() -> Result<()> {
}

fn run_typescript_tests() -> Result<()> {
cmd!("pnpm", "build").dir("crates/bindings-typescript").run()?;
cmd!("pnpm", "test").dir("crates/bindings-typescript").run()?;
cmd!("pnpm", "generate").dir("templates/chat-react-ts").run()?;
pnpm(["build"]).dir("crates/bindings-typescript").run()?;
pnpm(["test"]).dir("crates/bindings-typescript").run()?;
pnpm(["generate"]).dir("templates/chat-react-ts").run()?;
let diff_status = cmd!(
"bash",
"tools/check-diff.sh",
Expand All @@ -444,19 +462,19 @@ fn run_typescript_tests() -> Result<()> {
if !diff_status.status.success() {
bail!("Bindings are dirty. Please generate bindings again and commit them to this branch.");
}
cmd!("pnpm", "build").dir("templates/chat-react-ts").run()?;
cmd!("pnpm", "-r", "--filter", "./**", "run", "build")
pnpm(["build"]).dir("templates/chat-react-ts").run()?;
pnpm(["-r", "--filter", "./**", "run", "build"])
.dir("templates")
.run()?;
cmd!("pnpm", "-r", "--filter", "./**", "run", "build")
pnpm(["-r", "--filter", "./**", "run", "build"])
.dir("crates/bindings-typescript")
.run()?;
Ok(())
}

fn run_docs_build() -> Result<()> {
cmd!("pnpm", "install").dir("docs").run()?;
cmd!("pnpm", "build").dir("docs").run()?;
pnpm(["install"]).dir("docs").run()?;
pnpm(["build"]).dir("docs").run()?;
Ok(())
}

Expand All @@ -482,7 +500,7 @@ fn main() -> Result<()> {

match cli.cmd {
Some(CiCmd::Test) => {
cmd!("pnpm", "build").dir("crates/bindings-typescript").run()?;
pnpm(["build"]).dir("crates/bindings-typescript").run()?;

// TODO: This doesn't work on at least user Linux machines, because something here apparently uses `sudo`?

Expand Down Expand Up @@ -635,7 +653,7 @@ fn main() -> Result<()> {
cmd!("dotnet", "csharpier", "--check", ".")
.dir("crates/bindings-csharp")
.run()?;
cmd!("pnpm", "lint").run()?;
pnpm(["lint"]).run()?;
cmd!("cargo", "test", "--doc", "--target", "wasm32-unknown-unknown")
.dir("crates/bindings")
.run()?;
Expand Down Expand Up @@ -745,8 +763,8 @@ fn main() -> Result<()> {
);
}

cmd!("pnpm", "install", "--recursive").run()?;
cmd!("pnpm", "generate-cli-docs").dir("docs").run()?;
pnpm(["install", "--recursive"]).run()?;
pnpm(["generate-cli-docs"]).dir("docs").run()?;
let out = cmd!("git", "status", "--porcelain", "--", "docs").read()?;
if out.is_empty() {
log::info!("No docs changes detected");
Expand Down
Loading