From edf08300fdbc06b3a54235f8fde25ce58171325d Mon Sep 17 00:00:00 2001 From: darthsharp <48331467+darthsharp@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:52:38 +0200 Subject: [PATCH] Simplify argument handling and refine npm install logic. Refactored redundant object properties in `simple-git-version.ts` for cleaner code. Removed `--dryRun` flag from `nx-release-publish` task to align with execution context. Updated `npm-tasks.ts` to conditionally use `npm ci` for CI environments and `npm install` otherwise. --- builds/ci-build/src/build-it-lib/git/simple-git-version.ts | 4 ++-- builds/ci-build/src/build-it-lib/tasks/npm-tasks.ts | 6 +++++- builds/ci-build/src/build-it-lib/tasks/nx-tasks.ts | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/builds/ci-build/src/build-it-lib/git/simple-git-version.ts b/builds/ci-build/src/build-it-lib/git/simple-git-version.ts index 2b48303..5533b70 100644 --- a/builds/ci-build/src/build-it-lib/git/simple-git-version.ts +++ b/builds/ci-build/src/build-it-lib/git/simple-git-version.ts @@ -56,8 +56,8 @@ export class SimpleGitVersion { this.applyBranchRule({ lastTag, - lastVersionFromTag: lastVersionFromTag, - commitCountSinceLastTag: commitCountSinceLastTag, + lastVersionFromTag, + commitCountSinceLastTag, branchName, branchRule, version: newVersion, diff --git a/builds/ci-build/src/build-it-lib/tasks/npm-tasks.ts b/builds/ci-build/src/build-it-lib/tasks/npm-tasks.ts index 6d32892..cfe33a1 100644 --- a/builds/ci-build/src/build-it-lib/tasks/npm-tasks.ts +++ b/builds/ci-build/src/build-it-lib/tasks/npm-tasks.ts @@ -38,7 +38,11 @@ export class NpmTasks extends BuildTasks { await this.execute(async (buildContext) => { const args = options.legacyPeerDeps ? ['--legacy-peer-deps'] : []; - await this.cmdExecutor.executeStream('npm ci', args); + if (this.context.isCI) { + await this.cmdExecutor.executeStream('npm ci', args); + } else { + await this.cmdExecutor.executeStream('npm install'); + } }); } diff --git a/builds/ci-build/src/build-it-lib/tasks/nx-tasks.ts b/builds/ci-build/src/build-it-lib/tasks/nx-tasks.ts index b10b70f..db50f10 100644 --- a/builds/ci-build/src/build-it-lib/tasks/nx-tasks.ts +++ b/builds/ci-build/src/build-it-lib/tasks/nx-tasks.ts @@ -43,8 +43,6 @@ export class NxTasks extends BuildTasks { 'run', `${projectName}:nx-release-publish`, `--access ${access}`, - '--dryRun', - //'--registry=https://registry.npmjs.org/', ]; if (this.context.dryRun) {