From 8b1ba2ddd5e4d342da8ac6478b33a1b03fd8d9e9 Mon Sep 17 00:00:00 2001
From: MoojMidge <56883549+MoojMidge@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:53:30 +1100
Subject: [PATCH] Update workflows

---
 .github/workflows/make-release.yml   | 4 ++--
 .github/workflows/submit-release.yml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 8e8d45bab..621405513 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -70,7 +70,7 @@ jobs:
           git reset
           git checkout .
           git fetch origin nexus-unofficial
-          git cherry-pick ...origin/nexus-unofficial -n
+          git -c user.email="\<\>" -c user.name="make-release" merge -X theirs --allow-unrelated-histories origin/nexus-unofficial
           git clean -fdx
           mv .git ..
           rm -rf .??*
@@ -113,7 +113,7 @@ jobs:
           git reset
           git checkout .
           git fetch origin nexus-unofficial
-          git cherry-pick ...origin/nexus-unofficial -n
+          git -c user.email="\<\>" -c user.name="make-release" merge -X theirs --allow-unrelated-histories origin/nexus-unofficial
           git clean -fdx
           mv .git ..
           rm -rf .??*
diff --git a/.github/workflows/submit-release.yml b/.github/workflows/submit-release.yml
index 320950dc0..5b3574ec3 100644
--- a/.github/workflows/submit-release.yml
+++ b/.github/workflows/submit-release.yml
@@ -3,6 +3,9 @@ on:
   push:
     tags:
       - 'v*'
+      - '!*dev*'
+      - '!*alpha*'
+      - '!*beta*'
 
 jobs:
   release: