Skip to content

Commit ab0dbec

Browse files
committed
Revert "[nrf noup] ci: NCS-specific CI tweaks"
This reverts commit 6692263. Signed-off-by: Grzegorz Swiderski <[email protected]>
1 parent b724daa commit ab0dbec

File tree

4 files changed

+5
-38
lines changed

4 files changed

+5
-38
lines changed

.github/workflows/commit-tags.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/compliance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
git config --global user.name "Your Name"
3232
git remote -v
3333
# Ensure there's no merge commits in the PR
34-
#[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
35-
#(echo "::error ::Merge commits not allowed, rebase instead";false)
34+
[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
35+
(echo "::error ::Merge commits not allowed, rebase instead";false)
3636
rm -fr ".git/rebase-apply"
3737
rm -fr ".git/rebase-merge"
3838
git rebase origin/${BASE_REF}
@@ -83,7 +83,7 @@ jobs:
8383
# Increase rename limit to allow for large PRs
8484
git config diff.renameLimit 10000
8585
./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e ClangFormat \
86-
-e Kconfig -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
86+
-c origin/${BASE_REF}..
8787
8888
- name: upload-results
8989
uses: actions/upload-artifact@v4

Jenkinsfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

scripts/gitlint/zephyr_commit_rules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
7878
name = "title-max-length-no-revert"
7979
id = "UC5"
8080
target = CommitMessageTitle
81-
options_spec = [IntOption('line-length', 120, "Max line length")]
81+
options_spec = [IntOption('line-length', 75, "Max line length")]
8282
violation_message = "Commit title exceeds max length ({0}>{1})"
8383

8484
def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
103103
name = "max-line-length-with-exceptions"
104104
id = "UC4"
105105
target = CommitMessageBody
106-
options_spec = [IntOption('line-length', 120, "Max line length")]
106+
options_spec = [IntOption('line-length', 75, "Max line length")]
107107
violation_message = "Commit message body line exceeds max length ({0}>{1})"
108108

109109
def validate(self, line, _commit):

0 commit comments

Comments
 (0)