File tree 2 files changed +13
-6
lines changed
2 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 1
1
#! /bin/bash -e
2
2
3
- git config user.name opentelemetrybot
4
- git config user.email 107717825+opentelemetrybot @users.noreply.github.com
3
+ git config user.name ' ${{ steps.app-token.outputs.app-slug }}[bot] '
4
+ git config user.email ' ${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot] @users.noreply.github.com'
Original file line number Diff line number Diff line change @@ -20,15 +20,22 @@ jobs:
20
20
# history is needed to run git cherry-pick below
21
21
fetch-depth : 0
22
22
23
- - name : Use CLA approved github bot
24
- run : .github/scripts/use-cla-approved-github-bot.sh
25
-
26
23
- uses : actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
27
24
id : app-token
28
25
with :
29
- app-id : ${{ secrets.OPENTELEMETRY_BASIC_AUTOMATION_APP_ID }}
26
+ app-id : ${{ secrets.OPENTELEMETRY_BASIC_AUTOMATION_CLIENT_ID }}
30
27
private-key : ${{ secrets.OPENTELEMETRY_BASIC_AUTOMATION_PRIVATE_KEY }}
31
28
29
+ - name : Use CLA approved author
30
+ env :
31
+ GH_TOKEN : ${{ steps.app-token.outputs.token }}
32
+ run : |
33
+ user_name=${{ steps.app-token.outputs.app-slug }}[bot]
34
+ user_id=$(gh api "/users/$user_name" --jq .id)
35
+
36
+ git config user.name "$user_name"
37
+ git config user.email "${user_id}+${user_name}@users.noreply.github.com"
38
+
32
39
- name : Create pull request
33
40
env :
34
41
NUMBER : ${{ github.event.inputs.number }}
You can’t perform that action at this time.
0 commit comments