Skip to content

Commit e504446

Browse files
committed
Fix PR creation for bump-datadog-gem-version workflow
1 parent 1d26319 commit e504446

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

.github/workflows/update-system-tests.yml

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,51 @@ jobs:
5656
persist-credentials: true
5757
token: ${{ secrets.GITHUB_TOKEN }}
5858
fetch-depth: 0
59+
5960
- name: Set up Ruby
6061
uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
6162
with:
6263
ruby-version: "3.3.7"
64+
6365
- run: bundle install
66+
6467
- name: Update version file
6568
run: |
6669
echo "Updating version to ${NEXT_VERSION}"
6770
bundle exec rake version:bump["${NEXT_VERSION}]"
68-
- name: Create PR to master
69-
run: |
70-
JOB_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
71-
BRANCH_NAME="update-version-${NEXT_VERSION}"
7271
73-
git checkout -b "${BRANCH_NAME}"
72+
- name: Generate GitHub App Token
73+
id: generate-token
74+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
75+
with:
76+
app-id: ${{ secrets.APP_ID }}
77+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
7478

75-
git add lib/datadog/version.rb
76-
git commit -m "Update version to ${NEXT_VERSION}"
79+
- name: Create Pull Request
80+
# Skip PR creation if dry-run is true (from either trigger type)
81+
if: ${{ github.event.inputs.dry-run != 'true' && github.event.client_payload.dry-run != 'true' }}
82+
id: cpr
83+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
84+
with:
85+
token: ${{ steps.generate-token.outputs.token }}
86+
branch: auto-generate/bump-datadog-gem-version
87+
title: "[🤖] Bump datadog gem version to ${{ needs.next-gem-version.outputs.next_version }}"
88+
base: master
89+
labels: dev/internal
90+
commit-message: "[🤖] Update datadog gem version to ${{ needs.next-gem-version.outputs.next_version }}"
91+
delete-branch: true
92+
sign-commits: true
93+
add-paths: |
94+
lib/datadog/version.rb
95+
gemfiles/
96+
body: |
97+
_This is an auto-generated PR from [here](${{github.server_url}}/${{ github.repository }}/blob/master/.github/workflows/bump-datadog-gem-version.yml)_
98+
The PR updates the version of datadog gem to ${{ needs.next-gem-version.outputs.next_version }}
7799
78-
git push origin "${BRANCH_NAME}"
100+
**Trigger Information:**
101+
- Event: ${{ github.event_name }}
102+
- Triggered by: ${{ github.event.client_payload.triggered_by || 'Manual/Scheduled' }}
103+
- Source repo: ${{ github.event.client_payload.source_repo || 'N/A' }}
104+
- Source commit: ${{ github.event.client_payload.source_commit || 'N/A' }}
79105
80-
gh pr create \
81-
--base master \
82-
--head "${BRANCH_NAME}" \
83-
--title "Update version to ${NEXT_VERSION}" \
84-
--body "This is an auto-generated PR to update the version file from [here](${JOB_URL})." \
85-
--label "version"
106+
Please review the changes and merge when ready

0 commit comments

Comments
 (0)