Skip to content
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

Jump to bottom

Rework ide-desktop CI #7596

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Rework ide-desktop CI #7596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0ccc1c
Rework `ide-desktop` CI
somebody1234 Aug 17, 2023
a8f5b25
Merge branch 'develop' into wip/sb/rework-ide-desktop-ci
somebody1234 Aug 18, 2023
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
3 changes: 2 additions & 1 deletion app/ide-desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions build/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
Loading