Skip to content

ci(ci): skip commits already on develop when linting release PRs #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarTrepodi merged 1 commit into from
Oct 22, 2026
Merged

ci(ci): skip commits already on develop when linting release PRs #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .github/workflows/commitlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,24 @@ jobs:
- name: Validate commits
run: |
set -euo pipefail
git fetch --no-tags --quiet origin main
git fetch --no-tags --quiet origin \
+main:refs/remotes/origin/main +develop:refs/remotes/origin/develop
base="${{ github.event.pull_request.base.sha }}"
head="${{ github.event.pull_request.head.sha }}"
# Lint only the commits this PR actually introduces: exclude merge
# commits and any commit already reachable from main. Mergeback and
# automated back-merge PRs re-introduce main's (sometimes
# non-conventional squash) commits — those are already on main and are
# not this PR's responsibility to police.
commits="$(git rev-list --no-merges --reverse "${base}..${head}" --not FETCH_HEAD)"
landed=(origin/main)
# A release PR into main carries every develop commit, and each one was
# already linted (or exempted, as Dependabot's are below) by the PR that
# landed it on develop. Without this, a release re-lints Dependabot's
# "Bump ..." subjects outside a Dependabot PR and fails subject-case.
if [ "${{ github.event.pull_request.base.ref }}" = "main" ]; then
landed+=(origin/develop)
fi
commits="$(git rev-list --no-merges --reverse "${base}..${head}" --not "${landed[@]}")"
# Dependabot copies its subject casing from repo history rather than from
# dependabot.yml, so its "chore(deps): Bump ..." can fail subject-case. Its own
# commits are machine-generated and never reach the changelog, so skip them —
Expand All @@ -49,7 +58,7 @@ jobs:
if [ "${{ github.event.pull_request.user.login }}" = "dependabot[bot]" ]; then
bot="49699333+dependabot[bot]@users.noreply.github.com"
commits="$(git rev-list --no-merges --reverse --no-commit-header --format='%H %ae' \
"${base}..${head}" --not FETCH_HEAD | awk -v bot="${bot}" '$2 != bot { print $1 }')"
"${base}..${head}" --not "${landed[@]}" | awk -v bot="${bot}" '$2 != bot { print $1 }')"
echo "Dependabot PR: skipping commits authored by ${bot}."
fi
if [ -z "${commits}" ]; then
Expand Down
Loading