diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 8e8d45bab..2edfde4ff 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.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 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: