chore(repo): move pull, push release operations into workflow. ignore…

… release commits

.github/workflows/release.yml

@@ -7,6 +7,9 @@ on:
 
 jobs:
   publish:
+    # let's ignore release commits, otherwise it'll try to run twice
+    if: !startsWith(github.event.head_commit.message , 'chore(release):')
+
     runs-on: ubuntu-latest
 
     name: release
@@ -67,3 +70,12 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Push Release and Cleanup
+        run: |
+          git checkout .npmrc
+          git add . && git commit --amend --no-edit
+          git pull origin master --no-edit
+          git rebase
+          git push origin HEAD:master
+          git push origin HEAD:master -- tags

scripts/release.ts

@@ -17,7 +17,6 @@ const parserOptions = {
 const reBreaking = new RegExp(`(${parserOptions.noteKeywords.join(')|(')})`);
 const dryRun = process.argv.includes('--dry');
 const noPublish = process.argv.includes('--no-publish');
-const noPush = process.argv.includes('--no-push');
 const noTag = process.argv.includes('--no-tag');
 
 type Commit = parser.Commit<string | number | symbol>;
@@ -121,34 +120,6 @@ const publish = async (cwd: string) => {
   await execa('npm', ['publish', '--no-git-checks'], { cwd, stdio: 'inherit' });
 };
 
-const pull = async (main: string) => {
-  log(chalk`{blue Pulling Latest Changes from Remote and Rebasing}`);
-
-  await execa('git', ['checkout', '.npmrc']);
-  await execa('git', ['pull', 'origin', main, '--no-edit']);
-  const { stdout } = await execa('git', ['status']);
-  console.log({ stdout });
-  await execa('git', ['rebase']);
-};
-
-const push = async () => {
-  if (dryRun || noPush) {
-    log(chalk`{yellow Skipping Git Push}`);
-    return;
-  }
-
-  const { stdout: branches } = await execa('git', ['branch']);
-  const main = branches.includes('main') ? 'main' : 'master';
-
-  await pull(main);
-
-  const params = ['push', 'origin', `HEAD:${main}`];
-
-  log(chalk`{blue Pushing Release and Tags}`);
-  await execa('git', params);
-  await execa('git', [...params, '--tags']);
-};
-
 const tag = async (cwd: string, shortName: string, version: string) => {
   if (dryRun || noTag) {
     log(chalk`{yellow Skipping Git Tag}`);
@@ -257,7 +228,6 @@ const updatePackage = async (cwd: string, pkg: RepoPackage, version: string) =>
     await commitChanges(cwd, shortName, newVersion);
     await publish(cwd);
     await tag(cwd, shortName, newVersion);
-    await push();
   } catch (e) {
     log(e);
     process.exit(1);