Skip to content

Commit 21869b1

Browse files
committed
Revert "[nrf noup] ci: NCS-specific CI tweaks"
This reverts commit 65bc4d9. Signed-off-by: Carles Cufi <[email protected]>
1 parent 9999e1c commit 21869b1

File tree

4 files changed

+10
-39
lines changed

4 files changed

+10
-39
lines changed

.github/workflows/commit-tags.yml

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

.github/workflows/compliance.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
git config --global user.name "Your Name"
3535
git remote -v
3636
# Ensure there's no merge commits in the PR
37-
#[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
38-
#(echo "::error ::Merge commits not allowed, rebase instead";false)
37+
[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
38+
(echo "::error ::Merge commits not allowed, rebase instead";false)
3939
rm -fr ".git/rebase-apply"
4040
rm -fr ".git/rebase-merge"
4141
git rebase origin/${BASE_REF}
@@ -72,8 +72,12 @@ jobs:
7272
git log --pretty=oneline | head -n 10
7373
# Increase rename limit to allow for large PRs
7474
git config diff.renameLimit 10000
75-
./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat \
76-
-e Kconfig -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
75+
excludes="-e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat"
76+
# The signed-off-by check for dependabot should be skipped
77+
if [ "${{ github.actor }}" == "dependabot[bot]" ]; then
78+
excludes="$excludes -e Identity"
79+
fi
80+
./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
7781
7882
- name: upload-results
7983
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

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)