This commit is contained in:
Edward Firmo
2025-08-05 11:39:41 +02:00
parent 250b22562d
commit 1552aaec6c

View File

@@ -54,11 +54,11 @@ jobs:
repo: context.repo.repo, repo: context.repo.repo,
commit_sha: context.sha commit_sha: context.sha
}); });
if (associatedPRs.length > 0) { if (associatedPRs.length > 0) {
// Get the most recent merged PR // Get the most recent merged PR
const pr = associatedPRs.find(pr => pr.state === 'closed' && pr.merged_at) || associatedPRs[0]; const pr = associatedPRs.find(pr => pr.state === 'closed' && pr.merged_at) || associatedPRs[0];
return { return {
title: pr.title, title: pr.title,
body: pr.body || 'No description provided', body: pr.body || 'No description provided',
@@ -72,7 +72,7 @@ jobs:
repo: context.repo.repo, repo: context.repo.repo,
ref: context.sha ref: context.sha
}); });
return { return {
title: 'Direct push to main', title: 'Direct push to main',
body: commit.data.commit.message, body: commit.data.commit.message,
@@ -99,23 +99,23 @@ jobs:
id: tag_message id: tag_message
run: | run: |
NEW_VERSION=$(cat ./versioning/VERSION) NEW_VERSION=$(cat ./versioning/VERSION)
if [ "${{ github.event_name }}" == "push" ] && [ "${{ steps.pr_info.outcome }}" == "success" ]; then if [ "${{ github.event_name }}" == "push" ] && [ "${{ steps.pr_info.outcome }}" == "success" ]; then
# Use PR information directly in heredoc to avoid quoting issues # Use PR information directly in heredoc to avoid quoting issues
cat > tag_message.txt << EOF cat > tag_message.txt << EOF
# v${NEW_VERSION} - ${{ fromJson(steps.pr_info.outputs.result).title }} # v${NEW_VERSION} - ${{ fromJson(steps.pr_info.outputs.result).title }}
${{ fromJson(steps.pr_info.outputs.result).body }} ${{ fromJson(steps.pr_info.outputs.result).body }}
EOF EOF
else else
# Manual dispatch or PR info unavailable - simpler message # Manual dispatch or PR info unavailable - simpler message
cat > tag_message.txt << EOF cat > tag_message.txt << EOF
# v${NEW_VERSION} - Manual tag update # v${NEW_VERSION} - Manual tag update
Tag updated via manual workflow dispatch. Tag updated via manual workflow dispatch.
EOF EOF
fi fi
# Store the message for use in subsequent steps # Store the message for use in subsequent steps
echo "TAG_MESSAGE_FILE=tag_message.txt" >> $GITHUB_ENV echo "TAG_MESSAGE_FILE=tag_message.txt" >> $GITHUB_ENV