Skip to content

Commit 81e603d

Browse files
authored
Merge pull request #258 from coderdojo-japan/feature/add-pr-number-to-deploy-commit
feat: デプロイ時のコミットメッセージに PR番号を自動追加
2 parents 9adf8f2 + 2144644 commit 81e603d

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

bin/deploy.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,22 @@ git config user.email "[email protected]"
1010
git add -f README.md
1111
git add -f instances.csv
1212

13-
git commit --quiet -m "Deploy from actions"
13+
# マージコミットメッセージから PR番号を抽出
14+
PR_NUMBER=$(git log -1 --pretty=%B | grep -oE '#[0-9]+' | head -1 || echo "")
15+
16+
# コミットメッセージを動的に生成
17+
if [ -n "$PR_NUMBER" ]; then
18+
COMMIT_MSG="Deploy from actions (PR $PR_NUMBER)"
19+
else
20+
COMMIT_MSG="Deploy from actions"
21+
fi
22+
23+
# 追加されたサーバー情報を取得(オプション)
24+
NEW_SERVERS=$(git diff --cached instances.csv | grep '^+' | grep -v '^+++' | cut -d',' -f1 | sed 's/^+//' | head -3 | paste -sd ', ' || echo "")
25+
26+
if [ -n "$NEW_SERVERS" ]; then
27+
COMMIT_MSG="$COMMIT_MSG - Added: $NEW_SERVERS"
28+
fi
29+
30+
git commit --quiet -m "$COMMIT_MSG"
1431
git push --force --quiet "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" master:gh-pages

0 commit comments

Comments
 (0)