From acd7834e9f4e35179dd96a136dff9b97cbf454bc Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Wed, 22 Jan 2025 12:13:30 +0100 Subject: [PATCH 1/3] Remove a stray chevron --- actions/setup-bot-token/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/setup-bot-token/action.yml b/actions/setup-bot-token/action.yml index 6144e979..862f8da5 100644 --- a/actions/setup-bot-token/action.yml +++ b/actions/setup-bot-token/action.yml @@ -33,5 +33,5 @@ runs: - name: Set up Git run: | git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]' - git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>' + git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com' shell: bash From 0803a350ea9f6339782c0acc7eb01bf4e1378953 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Wed, 22 Jan 2025 12:19:03 +0100 Subject: [PATCH 2/3] Add app email as output --- actions/setup-bot-token/action.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/actions/setup-bot-token/action.yml b/actions/setup-bot-token/action.yml index 862f8da5..5d84d1c6 100644 --- a/actions/setup-bot-token/action.yml +++ b/actions/setup-bot-token/action.yml @@ -14,6 +14,9 @@ outputs: app-slug: description: GitHub App slug value: ${{ steps.app-token.outputs.app-slug }} + app-email: + description: The generated email for the Github App + value: ${{ steps.get-user-email.outputs.user-email }} runs: using: "composite" steps: @@ -30,8 +33,13 @@ runs: env: GH_TOKEN: ${{ steps.app-token.outputs.token }} + - name: Get Github app User email + id: get-user-email + run: echo "user-email=${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT" + shell: bash + - name: Set up Git run: | git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]' - git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com' + git config --global user.email '${{ steps.get-user-email.outputs.user-email }}' shell: bash From 338164c631671fc8543ff4394842982ba71037c1 Mon Sep 17 00:00:00 2001 From: Nikola Irinchev Date: Wed, 22 Jan 2025 13:09:28 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Gagik Amaryan --- actions/setup-bot-token/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/setup-bot-token/action.yml b/actions/setup-bot-token/action.yml index 5d84d1c6..37e0d35a 100644 --- a/actions/setup-bot-token/action.yml +++ b/actions/setup-bot-token/action.yml @@ -15,7 +15,7 @@ outputs: description: GitHub App slug value: ${{ steps.app-token.outputs.app-slug }} app-email: - description: The generated email for the Github App + description: The generated email for the GitHub App value: ${{ steps.get-user-email.outputs.user-email }} runs: using: "composite" @@ -33,7 +33,7 @@ runs: env: GH_TOKEN: ${{ steps.app-token.outputs.token }} - - name: Get Github app User email + - name: Get GitHub App User email id: get-user-email run: echo "user-email=${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT" shell: bash