Skip to content

Commit ad24968

Browse files
trasktrask
authored
Use bot token for PRs (#302)
1 parent 0b9ab8a commit ad24968

File tree

6 files changed

+59
-44
lines changed

6 files changed

+59
-44
lines changed

‎.github/workflows/backport.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ jobs:
2323
- name: Create pull request
2424
env:
2525
NUMBER: ${{ github.event.inputs.number }}
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
2727
run: |
2828
commit=$(gh pr view $NUMBER --json mergeCommit --jq .mergeCommit.oid)
2929
title=$(gh pr view $NUMBER --json title --jq .title)
3030
url=$(gh pr view $NUMBER --json url --jq .url)
3131
32-
git cherry-pick $commit
33-
git push origin HEAD:backport-$NUMBER-to-$GITHUB_REF_NAME
32+
branch=backport-$NUMBER-to-${GITHUB_REF_NAME//\//-}
3433
34+
git cherry-pick $commit
35+
git push origin HEAD:$branch
3536
gh pr create --title "[$GITHUB_REF_NAME] $title" \
36-
--body "Clean cherry-pick of #$NUMBER to the $GITHUB_REF_NAME branch." \
37-
--head backport-$NUMBER-to-$GITHUB_REF_NAME \
37+
--body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \
38+
--head $branch \
3839
--base $GITHUB_REF_NAME

‎.github/workflows/merge-change-log-to-main.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ jobs:
2222
# this will fail if there have been conflicting change log updates introduced in main
2323
- name: Create pull request against main
2424
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
2626
run: |
27+
message="Merge change log updates from $GITHUB_REF_NAME"
28+
body="Merge change log updates from \`$GITHUB_REF_NAME\`."
29+
branch=merge-change-log-updates-from-${GITHUB_REF_NAME//\//-}
30+
2731
git format-patch --stdout HEAD..origin/$GITHUB_REF_NAME CHANGELOG.md | git apply
28-
msg="Merge change log updates from $GITHUB_REF_NAME to main"
29-
git commit -a -m "$msg"
30-
git push origin HEAD:merge-change-log-updates-to-main
31-
gh pr create --title "$msg" \
32-
--body "$msg" \
33-
--head merge-change-log-updates-to-main \
32+
git commit -a -m "$message"
33+
git push origin HEAD:$branch
34+
gh pr create --title "$message" \
35+
--body "$body" \
36+
--head $branch \
3437
--base main

‎.github/workflows/prepare-patch-release.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ jobs:
3131
3232
- name: Create pull request
3333
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
3535
run: |
36-
msg="Prepare release $VERSION"
37-
git commit -a -m "$msg"
38-
git push origin HEAD:prepare-release-$VERSION
39-
gh pr create --title "[$GITHUB_REF_NAME] $msg" \
40-
--body "$msg" \
41-
--head prepare-release-$VERSION \
36+
message="Prepare release $VERSION"
37+
branch=prepare-release-$VERSION
38+
39+
git commit -a -m "$message"
40+
git push origin HEAD:$branch
41+
gh pr create --title "[$GITHUB_REF_NAME] $message" \
42+
--body "$message." \
43+
--head $branch \
4244
--base $GITHUB_REF_NAME

‎.github/workflows/prepare-release-branch.yml‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ jobs:
3030
3131
- name: Create pull request against the release branch
3232
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
3434
run: |
35-
msg="Prepare release $VERSION"
36-
git commit -a -m "$msg"
37-
git push origin HEAD:prepare-release-$VERSION
38-
gh pr create --title "[$RELEASE_BRANCH_NAME] $msg" \
39-
--body "$msg" \
40-
--head prepare-release-$VERSION \
35+
message="Prepare release $VERSION"
36+
branch=prepare-release-$VERSION
37+
38+
git commit -a -m "$message"
39+
git push origin HEAD:$branch
40+
gh pr create --title "[$RELEASE_BRANCH_NAME] $message" \
41+
--body "$message." \
42+
--head $branch \
4143
--base $RELEASE_BRANCH_NAME
4244
4345
create-pull-request-against-main:
@@ -58,19 +60,24 @@ jobs:
5860
next_version="$major.$((minor + 1)).0"
5961
sed -ri "s/[0-9]+\.[0-9]+\.[0-9]+/$next_version/" version.gradle.kts
6062
63+
echo "NEXT_VERSION=$next_version" >> $GITHUB_ENV
64+
6165
- name: Set git user
6266
run: |
6367
git config user.name opentelemetry-java-bot
6468
git config user.email [email protected]
6569
6670
- name: Create pull request against main
6771
env:
68-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
6973
run: |
70-
msg="Update version"
71-
git commit -a -m "$msg"
72-
git push origin HEAD:update-version-on-main
73-
gh pr create --title "$msg" \
74-
--body "$msg" \
75-
--head update-version-on-main \
74+
message="Update version to $NEXT_VERSION"
75+
body="Update version to \`$NEXT_VERSION\`."
76+
branch=update-version-to-$NEXT_VERSION
77+
78+
git commit -a -m "$message"
79+
git push origin HEAD:$branch
80+
gh pr create --title "$message" \
81+
--body "$body" \
82+
--head $branch \
7683
--base main

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Generate release notes
105105
env:
106-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
107107
run: |
108108
# conditional blocks not indented because of the heredoc
109109
if [[ $VERSION == *.0 ]]; then
@@ -141,7 +141,7 @@ jobs:
141141
142142
- name: Create GitHub release
143143
env:
144-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
145145
run: |
146146
cp jmx-metrics/build/libs/opentelemetry-jmx-metrics-$VERSION.jar opentelemetry-jmx-metrics.jar
147147
gh release create --target $GITHUB_REF_NAME \
@@ -153,7 +153,7 @@ jobs:
153153
154154
- name: Update the change log with the release date
155155
env:
156-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
156+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
157157
run: |
158158
date=$(gh release view v$VERSION --json publishedAt --jq .publishedAt | sed 's/T.*//')
159159
sed -ri "s/## Version $VERSION .*/## Version $VERSION ($date)/" CHANGELOG.md
@@ -165,12 +165,14 @@ jobs:
165165
166166
- name: Create pull request against the release branch
167167
env:
168-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
168+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
169169
run: |
170-
msg="Add $VERSION release date to the change log"
171-
git commit -a -m "$msg"
172-
git push origin HEAD:add-$VERSION-release-date
173-
gh pr create --title "[$GITHUB_REF_NAME] $msg" \
174-
--body "$msg" \
175-
--head add-$VERSION-release-date \
170+
message="Add the release date for $VERSION to the change log"
171+
branch=add-release-date-for-$VERSION
172+
173+
git commit -a -m "$message"
174+
git push origin HEAD:$branch
175+
gh pr create --title "[$GITHUB_REF_NAME] $message" \
176+
--body "$message." \
177+
--head $branch \
176178
--base $GITHUB_REF_NAME

‎.github/workflows/reusable-create-issue-for-failure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
- name: Create issue
1313
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
1515
run: |
1616
cat > body.txt << EOF
1717
[$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID) failed.

0 commit comments

Comments
 (0)