fix: 🐞 exec Git add only once to avoid file lock

jscutlery · Mar 5, 2021 · 4dfce73 · 4dfce73
1 parent 7007f5c
commit 4dfce73
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/semver/src/builders/version/utils/changelog.ts b/packages/semver/src/builders/version/utils/changelog.ts
@@ -1,7 +1,5 @@
-import { execFile } from 'child_process';
 import { resolve } from 'path';
 import { defer } from 'rxjs';
-import { promisify } from 'util';
 import * as changelog from 'standard-version/lib/lifecycles/changelog';
 import * as standardVersionDefaults from 'standard-version/defaults';
 
@@ -38,8 +36,6 @@ export function updateChangelog({
       },
       newVersion
     );
-    if (!dryRun) {
-      await promisify(execFile)('git', ['add', changelogPath]);
-    }
+    return changelogPath;
   });
 }
diff --git a/packages/semver/src/builders/version/utils/git.ts b/packages/semver/src/builders/version/utils/git.ts
@@ -79,3 +79,13 @@ export function tryPushToGitRemote({
     );
   });
 }
+
+export function gitAdd(
+  paths: string[],
+  dryRun = false
+): Observable<{ stderr: string; stdout: string }> {
+  return defer(() => {
+    const gitAddOptions = [...(dryRun ? ['--dry-run'] : []), ...paths];
+    return execAsync('git', ['add', ...gitAddOptions]);
+  });
+}
diff --git a/packages/semver/src/builders/version/version.ts b/packages/semver/src/builders/version/version.ts
@@ -7,6 +7,7 @@ import {
   getChangelogPath,
   updateChangelog,
 } from './utils/changelog';
+import { gitAdd } from './utils/git';
 import { getPackageFiles, getProjectRoots } from './utils/workspace';
 
 export interface CommonVersionOptions {
@@ -44,7 +45,8 @@ export function versionWorkspace({
                 })
               )
           )
-        )
+        ),
+        switchMap((changelogPaths) => gitAdd(changelogPaths))
       ),
       getPackageFiles(workspaceRoot).pipe(
         switchMap((packageFiles) =>