diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 6a570e7b..ea0502f1 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -4,17 +4,17 @@ on: branches: - main - '[0-9]+.[0-9]+.x' - types: [closed] + # types: [closed] workflow_dispatch: env: - COMMIT_EMAIL: sara-tagger@users.noreply.github.com + COMMIT_EMAIL: rasabot@rasa.com DEFAULT_PYTHON_VERSION: "3.10" jobs: if_merged_tag_release: name: Tag Release Version - if: startsWith(github.head_ref, 'prepare-release-') && github.event.pull_request.merged == true + ## if: startsWith(github.head_ref, 'prepare-release-') && github.event.pull_request.merged == true runs-on: ubuntu-22.04 steps: - name: Checkout git repository 🕝 @@ -66,7 +66,7 @@ jobs: - name: Configure git run: | git config --global user.email ${{ env.COMMIT_EMAIL }} - git config --global user.name "Github Actions" + git config --global user.name "rasabot" - name: Tag Release run: make tag-release diff --git a/scripts/release.py b/scripts/release.py index 65869a23..57bd0a8c 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -327,18 +327,18 @@ def tag_release() -> None: branch = git_current_branch() version = Version(get_current_version()) - if ( - not version.is_alpha - and not version.is_beta - and not git_current_branch_is_main_or_release() - ): - print( - f""" - You are currently on branch {branch}. - You should only apply release tags to release branches (e.g. 1.x) or main. - """ - ) - sys.exit(1) + # if ( + # not version.is_alpha + # and not version.is_beta + # and not git_current_branch_is_main_or_release() + # ): + # print( + # f""" + # You are currently on branch {branch}. + # You should only apply release tags to release branches (e.g. 1.x) or main. + # """ + # ) + # sys.exit(1) ensure_clean_git() tag = str(version) tag_commit(tag)