diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-01-16 09:42:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 09:42:03 +0000 |
| commit | 08a454c3cbad3bac2f0a027f5419d36b75cb6fc1 (patch) | |
| tree | 4aa24ae6b5501d99414e90f4977312e3d1ef5dfa | |
| parent | 310ea45a5a075c393fd10716817a0fa1ed372db5 (diff) | |
| parent | 1f17c1eaf9ef4190517d93c006c91ec8b6c60cea (diff) | |
Merge #138
138: Fix gitlint configuration: Disallow cleanup commits r=TheNeikos a=matthiasbeyer
Found that gitlint isn't properly configured, so I fixed it in this PR.
This PR also removes the fixup-check CI job, as gitlint does check this with the new configuration.
Co-authored-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | .github/workflows/check.yml | 6 | ||||
| -rw-r--r-- | .gitlint | 8 | ||||
| -rw-r--r-- | bors.toml | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index d920ab6..9b3e086 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -30,10 +30,4 @@ jobs: - name: Install gitlint run: pip install gitlint - run: gitlint --commits $(git merge-base origin/main HEAD).. - fixup-check: - runs-on: ubuntu-latest - if: github.event_name == 'pull_request' - steps: - - uses: actions/checkout@v3.3.0 - - uses: 13rac1/block-fixup-merge-action@v2.0.0 @@ -14,7 +14,7 @@ ignore=body-is-missing # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this # verbosity = 2 -# By default gitlint will ignore merge, revert, fixup and squash commits. +# By default gitlint will ignore merge, revert, fixup and squash commits. ignore-merge-commits=true # ignore-revert-commits=true # ignore-fixup-commits=true @@ -23,7 +23,7 @@ ignore-merge-commits=true # Ignore any data send to gitlint via stdin # ignore-stdin=true -# Fetch additional meta-data from the local repository when manually passing a +# Fetch additional meta-data from the local repository when manually passing a # commit message to gitlint via stdin or --commit-msg. Disabled by default. # staged=true @@ -38,7 +38,7 @@ ignore-merge-commits=true # Enable community contributed rules # See http://jorisroovers.github.io/gitlint/contrib_rules for details -contrib=CC1 +contrib=CC1, CC2 # Set the extra-path where gitlint will search for user defined rules # See http://jorisroovers.github.io/gitlint/user_defined_rules for details @@ -134,3 +134,5 @@ regex=(.*)dependabot(.*)|github-actions\[bot\] # types = bugfix,user-story,epic [contrib-body-requires-signed-off-by] +[contrib-disallow-cleanup-commits] + @@ -12,7 +12,6 @@ pr_status = [ # Github Actions "license", "dco-check", - "fixup-check", ] update_base_for_deletes = true cut_body_after = "<details>" |