From 4f5b377941793318606657fa6d9f1e56d91bb41c Mon Sep 17 00:00:00 2001
From: jamie-bitflight <jamie@bitflight.io>
Date: Wed, 4 Oct 2023 13:20:04 -0400
Subject: [PATCH] fix(release): update the release workflows

---
 .github/workflows/create_github_release.yml |  2 +-
 .github/workflows/create_npm_release.yml    | 15 ++++++++-------
 package.json                                |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml
index 09e27500..632b2ef9 100644
--- a/.github/workflows/create_github_release.yml
+++ b/.github/workflows/create_github_release.yml
@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 
 jobs:
-  release:
+  github-release:
     if: (!contains(github.event.head_commit.message, 'build(release)') && !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci'))
     name: Release GitHub Actions
     runs-on: ubuntu-latest
diff --git a/.github/workflows/create_npm_release.yml b/.github/workflows/create_npm_release.yml
index 65da4807..9539124b 100644
--- a/.github/workflows/create_npm_release.yml
+++ b/.github/workflows/create_npm_release.yml
@@ -10,8 +10,8 @@ on:
       - 'next'
 
 jobs:
-  release:
-    if: (!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'build(release)') && !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci'))
+  npm-release:
+    if: (!contains(github.event.head_commit.message, 'build(release)') && !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci'))
     name: Release GitHub Actions
     runs-on: ubuntu-latest
     permissions:
@@ -96,11 +96,12 @@ jobs:
 
       - name: Ship It
         run: |
-          git add -f dist package.json && \
-            git commit --allow-empty -m "build(release): version $(jq -r '.version' package.json)"
-          yarn auto shipit -vv && \
-            git tag -a "v$(jq -r '.version' package.json)" -m "build(release): version $(jq -r '.version' package.json)"
-            yarn postversion:manual
+          set -e
+          yarn auto shipit -vv
+          git add -f dist package.json
+          git commit --allow-empty -m "build(release): version $(jq -r '.version' package.json)"
+          git tag -a "v$(jq -r '.version' package.json)"
+          yarn postversion:manual
 
 
       # - name: Bump Package Version
diff --git a/package.json b/package.json
index ba767040..8279a942 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "postversion:manual": "git push --tags origin && git push origin",
     "pre-commit": "yarn build;lint-staged",
     "prepare": "[ -n ${GITHUB_ACTIONS:-} ] || husky install",
-    "release:script": "./release.sh",
     "release:post": "yarn npm publish --access public --tag v${npm_package_version} --tag latest",
     "test": "NODE_ENV=testing jest --runInBand",
     "test-ci": "NODE_ENV=testing jest --ci --reporters=default --reporters=jest-junit",