Rework ide-desktop CI (#7596)

This commit is contained in:
somebody1234 2023-08-23 01:23:30 +10:00 committed by GitHub
parent d078a37a6a
commit b3e9ea8714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -39,8 +39,9 @@
"watch": "npm run watch --workspace enso-content",
"watch-dashboard": "npm run watch --workspace enso-dashboard",
"build-dashboard": "npm run build --workspace enso-dashboard",
"typecheck": "npx tsc -p lib/types/tsconfig.json && npm run typecheck --workspace enso && npm run typecheck --workspace enso-content && npm run typecheck --workspace enso-dashboard && npm run typecheck --workspace enso-authentication",
"test": "npm run test --workspace enso-dashboard",
"typecheck": "npx tsc -p lib/types/tsconfig.json && npm run typecheck --workspace enso && npm run typecheck --workspace enso-content && npm run typecheck --workspace enso-dashboard && npm run typecheck --workspace enso-authentication"
"lint": "npm install && npm run test && npm run typecheck && npx eslint ."
},
"dependencies": {
"eslint-plugin-react": "^7.32.2",

View File

@ -87,7 +87,6 @@ use ide_ci::programs::git::clean;
use ide_ci::programs::rustc;
use ide_ci::programs::Cargo;
use ide_ci::programs::Npm;
use ide_ci::programs::Npx;
use std::time::Duration;
use tempfile::tempdir;
use tokio::process::Child;
@ -839,9 +838,7 @@ pub async fn main_internal(config: Option<enso_build::config::Config>) -> Result
ensogl_pack::build_ts_sources_only().await?;
prettier::check(&ctx.repo_root).await?;
let js_modules_root = ctx.repo_root.join("app/ide-desktop");
Npm.cmd()?.current_dir(&js_modules_root).args(["install"]).run_ok().await?;
Npm.cmd()?.current_dir(&js_modules_root).args(["run", "typecheck"]).run_ok().await?;
Npx.cmd()?.current_dir(&js_modules_root).args(["eslint", "."]).run_ok().await?;
Npm.cmd()?.current_dir(&js_modules_root).args(["run", "lint"]).run_ok().await?;
}
Target::Fmt => {
let prettier = prettier::write(&ctx.repo_root);