Skip to content

Commit b8166cf

Browse files
committed
follow up PR review
1 parent d78e46c commit b8166cf

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

.github/workflows/check-new-release.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,25 +191,36 @@ jobs:
191191
CURRENT_LTS: ${{ steps.current_versions.outputs.CURRENT_LTS }}
192192
LATEST_LTS: ${{ steps.latest_tags.outputs.LATEST_LTS }}
193193
DRY_RUN: ${{ github.event.inputs.dry_run == 'true' }}
194-
BRANCH_NAME: "bot/update-mysql-shell-$(date +%Y%m%d%H%M%S)"
195194
INNOVATION_UPDATE_NEEDED: ${{ steps.check_versions.outputs.INNOVATION_UPDATE_NEEDED }}
196195
LTS_UPDATE_NEEDED: ${{ steps.check_versions.outputs.LTS_UPDATE_NEEDED }}
197196
run: |
198-
# 外部スクリプトを実行(実行権限なしでbashコマンドで実行)
197+
# Generate branch name at runtime with timestamp
198+
BRANCH_NAME="bot/update-mysql-shell-$(date +%Y%m%d%H%M%S)"
199+
echo "Using branch name: $BRANCH_NAME"
200+
export BRANCH_NAME
201+
202+
# Execute external script (without execution permission, using bash command)
199203
bash .github/check-new-release/scripts/update.sh
200204
201205
# PR作成後に追加のメッセージを表示
202206
- name: Show post-PR creation message
203207
if: steps.check_versions.outputs.INNOVATION_UPDATE_NEEDED == 'true' || steps.check_versions.outputs.LTS_UPDATE_NEEDED == 'true'
204208
env:
205209
DRY_RUN: ${{ github.event.inputs.dry_run == 'true' }}
206-
BRANCH_NAME: "bot/update-mysql-shell-$(date +%Y%m%d%H%M%S)"
207210
INNOVATION_UPDATE_NEEDED: ${{ steps.check_versions.outputs.INNOVATION_UPDATE_NEEDED }}
208211
LTS_UPDATE_NEEDED: ${{ steps.check_versions.outputs.LTS_UPDATE_NEEDED }}
209212
LATEST_INNOVATION: ${{ steps.latest_tags.outputs.LATEST_INNOVATION }}
210213
LATEST_LTS: ${{ steps.latest_tags.outputs.LATEST_LTS }}
211214
run: |
212-
# 外部スクリプトを実行(実行権限なしでbashコマンドで実行)
215+
# Use the same branch name from the previous step (if available) or regenerate it
216+
if [ -z "$BRANCH_NAME" ]; then
217+
BRANCH_NAME="bot/update-mysql-shell-$(date +%Y%m%d%H%M%S)"
218+
echo "Regenerated branch name: $BRANCH_NAME"
219+
else
220+
echo "Using existing branch name: $BRANCH_NAME"
221+
fi
222+
223+
# Execute external script (without execution permission, using bash command)
213224
bash .github/check-new-release/scripts/post-message.sh
214225
215226
# ステップ6: 更新不要の場合の通知

0 commit comments

Comments
 (0)