From 1b7e16954ab6066195dcf1f4f57ff4636f3654d2 Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Fri, 5 Jul 2024 11:29:28 -0400
Subject: [PATCH] fix: consolidate version bumps

---
 .github/workflows/publish.yml | 61 -----------------------------------
 .github/workflows/version.yml | 56 +++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 62 deletions(-)
 delete mode 100644 .github/workflows/publish.yml

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index a96588a3d..000000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Publish to Registry 📦
-on:
-  push:
-    tags:
-      - '*'
-      - '!v4'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: dev
-
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          registry-url: 'https://registry.npmjs.org'
-          scope: '@jamesives'
-
-      - name: Configure Git
-        run: |
-          git config user.email "iam@jamesiv.es"
-          git config user.name "James Ives"
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
-      - run: yarn install --frozen-lockfile
-      - run: yarn build
-      - run: git stash
-      - name: Set version to match the tag
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          npm version $VERSION -m "Release $VERSION 📣"
-        env:
-          GITHUB_REF: ${{ github.ref }}
-      - run: git push
-
-      # Publish to npm
-      - run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      # Setup .npmrc file to publish to GitHub Packages
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          registry-url: 'https://npm.pkg.github.com'
-          scope: '@jamesives'
-
-      - name: Authenticate with the GitHub Package Registry
-        run: |
-          echo "//npm.pkg.github.com:_authToken=${{ secrets.GITHUB_TOKEN }}" > ~/.npmrc
-
-      # Publish to GitHub Packages
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index 3b5af5739..dca5b3855 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -1,4 +1,4 @@
-name: Update Major Version Tag 🏷️
+name: Update Major Version Tag and Publish to Registry 📦
 
 on:
   push:
@@ -11,3 +11,57 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: nowactions/update-majorver@v1.1.2
+
+  update-registries:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: dev
+
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+          scope: '@jamesives'
+
+      - name: Configure Git
+        run: |
+          git config user.email "iam@jamesiv.es"
+          git config user.name "James Ives"
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn build
+      - run: git stash
+      - name: Set version to match the tag
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          npm version $VERSION -m "Release $VERSION 📣"
+        env:
+          GITHUB_REF: ${{ github.ref }}
+      - run: git push
+
+      # Publish to npm
+      - run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      # Setup .npmrc file to publish to GitHub Packages
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://npm.pkg.github.com'
+          scope: '@jamesives'
+
+      - name: Authenticate with the GitHub Package Registry
+        run: |
+          echo "//npm.pkg.github.com:_authToken=${{ secrets.GITHUB_TOKEN }}" > ~/.npmrc
+
+      # Publish to GitHub Packages
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file