Skip to content
This repository was archived by the owner on Jan 17, 2024. It is now read-only.

Commit 2e79df9

Browse files
committed
Merge branch 'main' into release/2024.1.27
2 parents 3c77c63 + 0a9834d commit 2e79df9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/merge.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ jobs:
4949
# release/ブランチとタグを作成
5050
- name: Commit version
5151
run: |
52-
git commit -am "[skip ci] Release: ${{ steps.v.outputs.target_version }}"
53-
git push origin HEAD:release/${{ steps.v.outputs.target_version }}
52+
if [ -n "$(git status --porcelain)" ]; then
53+
git commit -am "[skip ci] Release: ${{ steps.v.outputs.target_version }}"
54+
git push origin HEAD:release/${{ steps.v.outputs.target_version }}
55+
fi
5456
5557
- name: Try Merge
5658
run: |

0 commit comments

Comments
 (0)