From 562d7f1e2274f0dd6f09ac1e9767a1e4bc95ae1f Mon Sep 17 00:00:00 2001 From: AsadHasan-Rasa Date: Thu, 12 Sep 2024 16:30:27 +0100 Subject: [PATCH 1/3] ENG-1235: change credentials of release tagger --- .github/workflows/tag-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 6a570e7b..7ea69f29 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - COMMIT_EMAIL: sara-tagger@users.noreply.github.com + COMMIT_EMAIL: rasabot@rasa.com DEFAULT_PYTHON_VERSION: "3.10" jobs: @@ -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 From 5ba0c6ef1e406483196effc3de7e9c319c82c1da Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 12 Sep 2024 16:47:19 +0100 Subject: [PATCH 2/3] ENG-1235: Testing the change in GHA WF, so temporarily disabling branch checks --- .github/workflows/tag-release.yml | 2 +- scripts/release.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 7ea69f29..4b68df98 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -4,7 +4,7 @@ on: branches: - main - '[0-9]+.[0-9]+.x' - types: [closed] + # types: [closed] workflow_dispatch: env: 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) From 580bd70b9788037ab84f94795f9002b836856943 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 12 Sep 2024 16:50:08 +0100 Subject: [PATCH 3/3] ENG-1235: disabling another check --- .github/workflows/tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 4b68df98..ea0502f1 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -14,7 +14,7 @@ env: 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 🕝