Skip to content

Commit 64b930f

Browse files
authored
Fix bot branch names (#5689)
* Fix bot branch names * git commit -a
1 parent ec97a43 commit 64b930f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ jobs:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343
run: |
4444
msg="Prepare patch release ${{ steps.set-versions.outputs.release-version }}"
45-
git add -u
46-
git commit -m "$msg"
45+
git commit -a -m "$msg"
4746
git push origin HEAD:opentelemetry-java-bot/prepare-patch-release-${{ steps.set-versions.outputs.release-version }}
4847
gh pr create --title "$msg" \
4948
--body "$msg" \
50-
--head prepare-patch-release-${{ steps.set-versions.outputs.release-version }} \
49+
--head opentelemetry-java-bot/prepare-patch-release-${{ steps.set-versions.outputs.release-version }} \
5150
--base ${{ github.ref_name }}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ jobs:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
run: |
5151
msg="Prepare release branch ${{ needs.prepare-release-branch.outputs.release-branch-name }}"
52-
git add -u
53-
git commit -m "$msg"
52+
git commit -a -m "$msg"
5453
git push origin HEAD:opentelemetry-java-bot/prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }}
5554
gh pr create --title "$msg" \
5655
--body "$msg" \
57-
--head prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }} \
56+
--head opentelemetry-java-bot/prepare-release-branch-${{ needs.prepare-release-branch.outputs.release-branch-name }} \
5857
--base ${{ needs.prepare-release-branch.outputs.release-branch-name }}
5958
6059
create-pull-request-against-main:
@@ -86,7 +85,9 @@ jobs:
8685
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8786
run: |
8887
msg="Bump snapshot version"
89-
git add -u
90-
git commit -m "$msg"
88+
git commit -a -m "$msg"
9189
git push origin HEAD:opentelemetry-java-bot/bump-snapshot-version
92-
gh pr create --title "$msg" --body "$msg" --head bump-snapshot-version --base main
90+
gh pr create --title "$msg" \
91+
--body "$msg" \
92+
--head opentelemetry-java-bot/bump-snapshot-version \
93+
--base main

0 commit comments

Comments
 (0)