From d03fea5aec5eb78dd3148a05e959209348122c1b Mon Sep 17 00:00:00 2001 From: Philipp Burckhardt Date: Tue, 24 Sep 2024 09:36:02 -0400 Subject: [PATCH] build: tweak generated comment and run on PR target --- .github/workflows/generate_pr_commit_message.yml | 7 ++++++- .github/workflows/scripts/generate_pr_commit_message | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_pr_commit_message.yml b/.github/workflows/generate_pr_commit_message.yml index 859fa86b267..181b95814d5 100644 --- a/.github/workflows/generate_pr_commit_message.yml +++ b/.github/workflows/generate_pr_commit_message.yml @@ -21,14 +21,19 @@ name: generate_pr_commit_message # Workflow triggers: on: - pull_request: + pull_request_target: types: - labeled # Global permissions: permissions: + # Allow read-only access to the repository contents: contents: read + + # Allow write access to issues, assignees, labels, and milestones: issues: write + + # Allow write access to pull requests: pull-requests: write # Workflow jobs: diff --git a/.github/workflows/scripts/generate_pr_commit_message b/.github/workflows/scripts/generate_pr_commit_message index 92bf02735a0..7fa0f434f10 100755 --- a/.github/workflows/scripts/generate_pr_commit_message +++ b/.github/workflows/scripts/generate_pr_commit_message @@ -112,7 +112,7 @@ main() { pr_commits=$(github_api "GET" "/repos/$REPO_OWNER/$REPO_NAME/pulls/$pr_number/commits") # Extract co-authors from commits: - co_authors=$(echo "$pr_commits" | jq -r '.[].commit.message' | grep -i "Co-authored-by:" | awk -F': ' '{print $2}' | sort | uniq | paste -sd '\n' -) + co_authors=$(echo "$pr_commits" | jq -r '.[].commit.message' | grep -Eio "Co-authored-by:.*" | sort -u) # Extract 'Signed-off-by' lines from commits: signed_off_bys=$(echo "$pr_commits" | jq -r '.[].commit.message' | grep -Eio 'Signed-off-by:.*' | sort -u) @@ -147,6 +147,7 @@ main() { if [ -n "$ref_issues" ]; then commit_body+="\n$ref_issues" fi + commit_body+="\n" if [ -n "$co_authors" ]; then commit_body+="\n$co_authors" fi