Skip to content

Commit

Permalink
fix: リリースワークフローのMerge PRがコケる
Browse files Browse the repository at this point in the history
  • Loading branch information
taiyme committed Aug 29, 2024
1 parent 47a943a commit 74dd246
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,9 @@ jobs:
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add .
git commit -m "Release: ${{ needs.parse_new_version.outputs.NEW_VERSION }}"
git tag "${{ needs.parse_new_version.outputs.NEW_VERSION }}"
git push origin HEAD --follow-tags
git tag ${{ needs.parse_new_version.outputs.NEW_VERSION }}
git push origin HEAD
git push origin ${{ needs.parse_new_version.outputs.NEW_VERSION }}
publish_docker_image:
name: Publish Docker image
Expand All @@ -194,6 +195,12 @@ jobs:
pull-requests: write
contents: write
steps:
- name: Checkout ${{ env.develop_branch }} branch
uses: actions/checkout@v4
with:
ref: ${{ env.develop_branch }}
fetch-depth: 1

- name: Merge PR
run: |
gh pr ready ${{ needs.create_pr.outputs.PR_NUMBER }}
Expand All @@ -218,4 +225,4 @@ jobs:

- name: Release
run: |
gh release create "${{ needs.parse_new_version.outputs.NEW_VERSION }}" --generate-notes
gh release create ${{ needs.parse_new_version.outputs.NEW_VERSION }} --generate-notes

0 comments on commit 74dd246

Please sign in to comment.