Update workflows

MoojMidge · Jan 16, 2024 · e968e08 · e968e08
1 parent 6f33351
commit e968e08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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.name="make-release-workflow" merge origin/nexus-unofficial --allow-unrelated-histories
           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.name="make-release-workflow" merge origin/nexus-unofficial --allow-unrelated-histories
           git clean -fdx
           mv .git ..
           rm -rf .??*

diff --git 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: