From 222af6b24d0eb942a1bb20acf4f6316d43359112 Mon Sep 17 00:00:00 2001 From: Jonas Maison Date: Fri, 6 Jan 2023 18:07:39 +0100 Subject: [PATCH 1/4] ci: update publish.yml --- .github/workflows/publish.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 24c89c820..3fa452ba5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -68,10 +68,11 @@ jobs: - name: create PR to merge release branch and master run: | git fetch - git checkout release/${{ github.ref_name }} - git checkout -b merge_release/${{ github.ref_name }} - git push - gh pr create --fill + release_branch_version=$(git branch -a --contains ${{ github.ref_name }} | awk -F '/' '{print $NF}') + git checkout release/$release_branch_version + git checkout -b merge_release/$release_branch_version + git push --set-upstream origin merge_release/$release_branch_version + gh pr create --fill --reviewer kili-technology/ml env: GH_TOKEN: ${{ github.token }} From 2ded80453c6248c90d35d9c642d0e9e0df33d271 Mon Sep 17 00:00:00 2001 From: Jonas Maison Date: Fri, 6 Jan 2023 18:35:41 +0100 Subject: [PATCH 2/4] ci: update publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3fa452ba5..95c2a8b47 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -68,7 +68,7 @@ jobs: - name: create PR to merge release branch and master run: | git fetch - release_branch_version=$(git branch -a --contains ${{ github.ref_name }} | awk -F '/' '{print $NF}') + release_branch_version=$(git branch -a --contains ${{ github.ref_name }} | grep remotes/origin/release | awk -F '/' '{print $NF}') git checkout release/$release_branch_version git checkout -b merge_release/$release_branch_version git push --set-upstream origin merge_release/$release_branch_version From 0b17fc0cfcba52e73413f65932e9a9f228a900cd Mon Sep 17 00:00:00 2001 From: Jonas Maison Date: Fri, 6 Jan 2023 19:18:36 +0100 Subject: [PATCH 3/4] ci: update publish.yml --- .github/workflows/publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 95c2a8b47..2fb4d5671 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -65,6 +65,11 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_PYTHON_SDK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK + - name: Set git identity + run: | + git config --global user.name github-actions[bot] + git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com + - name: create PR to merge release branch and master run: | git fetch From e4ec311a9dc0d419dd618262c76b169c580d44f3 Mon Sep 17 00:00:00 2001 From: Jonas Maison Date: Fri, 6 Jan 2023 23:23:55 +0100 Subject: [PATCH 4/4] ci: update publish.yml --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2fb4d5671..2fdfeb058 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -67,8 +67,8 @@ jobs: - name: Set git identity run: | - git config --global user.name github-actions[bot] - git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com + git config user.name ci-bot + git config user.email ci-bot@example.com - name: create PR to merge release branch and master run: |