Skip to content

Commit 32a02ca

Browse files
committed
add ci job to find fixup commits
Using fixup commits is a helpful strategy while working on a PR. Though they should never be merged into the `main` branch. Therefore a PR should be blocked as long as there are still some fixup commits remaining.
1 parent ec50219 commit 32a02ca

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

.circleci/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ jobs:
7777
- run_pre_commit_hook:
7878
hook_id: trailing-whitespace
7979

80+
find_fixup_commits:
81+
executor: base_executor
82+
steps:
83+
- attach_workspace: **attach_options
84+
- run:
85+
name: Verify that there are no fixup commits in the git history
86+
command: >
87+
exit $(git log --pretty=format:%s main.. | grep fixup! | wc --lines)
88+
8089
workflows:
8190
version: 2
8291
default:
@@ -88,3 +97,6 @@ workflows:
8897
- check_formatting:
8998
requires:
9099
- setup
100+
- find_fixup_commits:
101+
requires:
102+
- setup

0 commit comments

Comments
 (0)