From 4d25594df9a33dd742976beabfc95e94d32a7164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20B=C3=A4hler?= <oliverbaehler@hotmail.com>
Date: Tue, 24 Oct 2023 17:04:14 +0200
Subject: [PATCH] chore(repo): remove scopes as mandatory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 .github/workflows/check-pr.yml | 13 +------------
 CONTRIBUTING.md                | 16 +---------------
 commitlint.config.js           |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index 53e70d1b..c5cc3bae 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -27,18 +27,7 @@ jobs:
             fix
             test
             sec
-          requireScope: false  
-          scopes: |
-            all
-            chart
-            operator
-            manifest
-            website
-            e2e
-            release
-            repo
-            deps
-            make
+          requireScope: false
           wip: false
           # If the PR only contains a single commit, the action will validate that
           # it matches the configured pattern.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2bbf9013..c6040fa2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -173,7 +173,7 @@ The semantics should indicate the change and it's impact. The general format for
     |    |_______ Scope
     |____________ Type
 
- The commits are checked on pull-request. If the commit message does not follow the format, the workflow will fail. See the [Types](#types) and [Scopes](#scopes) sections for more information.
+ The commits are checked on pull-request. If the commit message does not follow the format, the workflow will fail. See the [Types](#types) for the supported types. The scope is not required but helps to provide more context for your changes. Try to use a scope if possible.
 
 ### Types
 
@@ -187,17 +187,3 @@ The following types are allowed for commits and pull requests:
   * `test`: test related changes
   * `sec`: security related changes
 
-### Scopes
-
-The following types are allowed for commits and pull requests:
-
-  * `all`: changes that affect all components
-  * `chart`: changes to the Helm chart
-  * `operator`: changes to the operator
-  * `manifest`: changes to the manifest installer
-  * `website`: changes to the website
-  * `e2e`: changes to the e2e testing process
-  * `release`: changes to the release process
-  * `repo`: changes to general repository files
-  * `deps`: dependency updates
-  * `make`: changes to Makefile
diff --git a/commitlint.config.js b/commitlint.config.js
index aff134fb..c43c3ce9 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -2,8 +2,8 @@ const Configuration = {
     extends: ['@commitlint/config-conventional'],
     plugins: ['commitlint-plugin-function-rules'],
     rules: {
-      'scope-enum': [2, 'always', ['all', 'chart', 'operator', 'manifest', 'deps', 'release', 'website', 'repo', 'e2e', 'make']],
       'type-enum': [2, 'always', ['chore', 'ci', 'docs', 'feat', 'test', 'fix', 'sec']],
+      'body-max-line-length': [1, 'always', 500],
     },
     /*
      * Whether commitlint uses the default ignore rules, see the description above.