summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyqsimon <28627918+cyqsimon@users.noreply.github.com>2023-12-01 19:18:10 +0800
committerGitHub <noreply@github.com>2023-12-01 11:18:10 +0000
commit51203ff750008f6ba39f831caeed70a11cd74e2c (patch)
treeb54f1771cf7df72b97f8842ea01e640574e4fdac
parent96cef9a24ee3193e7e26b1ef43f6ab3846f2b351 (diff)
Use GitHub API to get correct PR submitter (#2791)
-rw-r--r--.github/workflows/require-changelog-for-PRs.yml9
-rw-r--r--CHANGELOG.md1
2 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/require-changelog-for-PRs.yml b/.github/workflows/require-changelog-for-PRs.yml
index 518fa9d5..263fee22 100644
--- a/.github/workflows/require-changelog-for-PRs.yml
+++ b/.github/workflows/require-changelog-for-PRs.yml
@@ -10,14 +10,21 @@ jobs:
# dependabot PRs are automerged if CI passes; we shouldn't block these
if: github.actor != 'dependabot[bot]'
env:
- PR_SUBMITTER: ${{ github.actor }}
PR_NUMBER: ${{ github.event.number }}
PR_BASE: ${{ github.base_ref }}
steps:
- uses: actions/checkout@v4
- name: Fetch PR base
run: git fetch --no-tags --prune --depth=1 origin
+
+ # cannot use `github.actor`: the triggering commit may be authored by a maintainer
+ - name: Get PR submitter
+ id: get-submitter
+ run: curl -sSfL https://api.github.com/repos/sharkdp/bat/pulls/${PR_NUMBER} | jq -r '"submitter=" + .user.login' | tee -a $GITHUB_OUTPUT
+
- name: Search for added line in changelog
+ env:
+ PR_SUBMITTER: ${{ steps.get-submitter.outputs.submitter }}
run: |
ADDED=$(git diff -U0 "origin/${PR_BASE}" HEAD -- CHANGELOG.md | grep -P '^\+[^\+].+$')
echo "Added lines in CHANGELOG.md:"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782d80f2..3aa1b0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
- Upgrade to Rust 2021 edition #2748 (@cyqsimon)
- Refactor and cleanup build script #2756 (@cyqsimon)
- Checks changelog has been written to for PRs in CI #2766 (@cyqsimon)
+ - Use GitHub API to get correct PR submitter #2791 (@cyqsimon)
- Minor benchmark script improvements #2768 (@cyqsimon)
- Update and improve `zsh` completion, see #2772 (@okapia)