From b3e9ea87146c4643fd8be3f2983a50447d035d58 Mon Sep 17 00:00:00 2001 From: somebody1234 Date: Wed, 23 Aug 2023 01:23:30 +1000 Subject: [PATCH] Rework `ide-desktop` CI (#7596) --- app/ide-desktop/package.json | 3 ++- build/cli/src/lib.rs | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/ide-desktop/package.json b/app/ide-desktop/package.json index 30a406ece986..5de570aec897 100644 --- a/app/ide-desktop/package.json +++ b/app/ide-desktop/package.json @@ -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", diff --git a/build/cli/src/lib.rs b/build/cli/src/lib.rs index f07aae61050a..b107fadfbc0b 100644 --- a/build/cli/src/lib.rs +++ b/build/cli/src/lib.rs @@ -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) -> 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);