fix: smarter file staging logic

flarum · Aug 9, 2022 · 2f5c553 · 2f5c553
1 parent edafd3b
commit 2f5c553
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/jobs/commitChangesToGit.ts b/src/jobs/commitChangesToGit.ts
@@ -35,17 +35,23 @@ export default async function commitChangesToGit(jp: FSJetpack): Promise<void> {
 
   await git.addConfig('user.name', config.author.name).addConfig('user.email', config.author.email);
 
+  const status = await git.status();
+
+  if (status.isClean()) {
+    log('No changes to commit.');
+    return;
+  }
+
   debugLog(`** Staging all changes`);
 
   if (core.getInput('commit_all_dirty') === 'true') await git.add(['-A']);
 
-  // For monorepos
-  await git.add(["':(glob)**/*/js/dist-typings/*'"]);
-  await git.add(["':(glob)**/*/js/dist/*'"]);
-
-  // For non-monorepos
-  await git.add(['dist/*']);
-  await git.add(['dist-typings/*']);
+  status.files.forEach((file) => {
+    if (file.path.match(/^([A-z0-9_\/-]*\/){0,1}js\/(?:dist|dist-typings)\/.*$/)) {
+      debugLog(`** Staging ${file.path}`);
+      git.add(file.path);
+    }
+  });
 
   const hash = process.env.GITHUB_SHA;
 
@@ -61,8 +67,6 @@ Includes transpiled JS/TS${core.getInput('build_typings_script') !== '' ? ', and
 
   await git.addRemote('upstream', `https://${process.env.GITHUB_ACTOR}:${token}@github.com/${process.env.GITHUB_REPOSITORY}.git`);
 
-  const status = await git.status();
-
   log(`${status}`);
 
   await git.push(`upstream`);