Skip to content

Commit 098762d

Browse files
committed
1 parent 38f6bfa commit 098762d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@ jobs:
7777
- uses: FantasticFiasco/action-update-license-year@v2
7878
with:
7979
token: ${{ secrets.GITHUB_TOKEN }}
80+
id: license
8081
- name: Merge PR
81-
# Disabled until issue with wrong merging PR is fixed.
82-
# See https://github.com/FantasticFiasco/action-update-license-year/discussions/276#discussioncomment-3985583
83-
if: ${{ false }}
82+
if: steps.license.outputs.pullRequestNumber != ''
8483
env:
8584
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86-
run: gh pr merge --rebase --delete-branch
85+
run: gh pr merge --rebase --delete-branch ${{ steps.license.outputs.pullRequestNumber }}

0 commit comments

Comments
 (0)