From 37ef4fb92b20356a8c2a8de44ab04a4d0adb8575 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Thu, 26 Mar 2026 14:52:23 +0100 Subject: [PATCH 1/5] CI yamllint: lint all changed files Filter out files inside the .yamllint configuration --- .github/workflows/ci_lint.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci_lint.yml b/.github/workflows/ci_lint.yml index 7ff16b73dc4f..7324698ca99e 100644 --- a/.github/workflows/ci_lint.yml +++ b/.github/workflows/ci_lint.yml @@ -6,7 +6,7 @@ permissions: contents: read jobs: yamllint: - name: Yaml Lint on Changed Controls and Profiles Files + name: Yaml Lint on Changed yaml files runs-on: ubuntu-latest steps: - name: Install Git @@ -27,18 +27,6 @@ jobs: url="repos/$repo/pulls/$pr_number/files" response=$(gh api "$url" --paginate) echo "$response" | jq -r '.[].filename' > filenames.txt - cat filenames.txt - - if grep -q "controls/" filenames.txt; then - echo "CONTROLS_CHANGES=true" >> $GITHUB_ENV - else - echo "CONTROLS_CHANGES=false" >> $GITHUB_ENV - fi - if grep -q "\.profile" filenames.txt; then - echo "PROFILES_CHANGES=true" >> $GITHUB_ENV - else - echo "PROFILES_CHANGES=false" >> $GITHUB_ENV - fi env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -46,18 +34,9 @@ jobs: if: ${{ env.CONTROLS_CHANGES == 'true' || env.PROFILES_CHANGES == 'true' }} run: pip install yamllint - - name: Run yamllint in Control Files Modified by PR - if: ${{ env.CONTROLS_CHANGES == 'true' }} - run: | - for control_file in $(cat filenames.txt | grep "controls/"); do - echo "Running yamllint on $control_file..." - yamllint "$control_file" - done - - - name: Run yamllint in Profile Files Modified by PR - if: ${{ env.PROFILES_CHANGES == 'true' }} + - name: Run yamllint on files modified by the PR run: | - for profile_file in $(cat filenames.txt | grep "\.profile"); do - echo "Running yamllint on $profile_file..." - yamllint "$profile_file" + for file in $(cat filenames.txt); do + echo "Running yamllint on $file..." + yamllint -c .yamllint "$file" done From 975e2d67bd8250136ddaffa2d8df6278a969e7f6 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 27 Mar 2026 12:47:51 +0100 Subject: [PATCH 2/5] yamllint config: lint only certain file extensions also enforce line length of 99 --- .yamllint | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.yamllint b/.yamllint index 7a97bcd9229b..83b0319dc670 100644 --- a/.yamllint +++ b/.yamllint @@ -1,5 +1,10 @@ --- extends: default +locale: en_US.UTF-8 +yaml-files: + - "*.yaml" + - "*.yml" + - "*.fmf" # https://yamllint.readthedocs.io/en/stable/rules.html rules: @@ -10,4 +15,5 @@ rules: level: warning indentation: spaces: consistent - line-length: disable + line-length: + max: 99 From a4e4e59c31d6797ae27bf0b002295552033af91d Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 27 Mar 2026 14:04:07 +0100 Subject: [PATCH 3/5] yamllint config: add comments and disable truthy rule --- .yamllint | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.yamllint b/.yamllint index 83b0319dc670..0ea0118098df 100644 --- a/.yamllint +++ b/.yamllint @@ -8,12 +8,13 @@ yaml-files: # https://yamllint.readthedocs.io/en/stable/rules.html rules: - comments: disable - comments-indentation: disable - document-start: disable + truthy: disable # do not check for strict true / false boolean values + comments: disable # disable syntax checking of comments + comments-indentation: disable # disable indentation checks for comments + document-start: disable # do not require the document start marker empty-lines: - level: warning + level: warning # only warn about empty lines indentation: - spaces: consistent + spaces: consistent # pass lint if spaces are used for indentation and multiple of spaces is consistent through a file line-length: - max: 99 + max: 99 # allow lines up to 99 chars From f4ee494c34b0a1edb4051b736c1226099d937907 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 27 Mar 2026 14:04:24 +0100 Subject: [PATCH 4/5] fix lint error in the workflow file --- .github/workflows/ci_lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_lint.yml b/.github/workflows/ci_lint.yml index 7324698ca99e..000615977861 100644 --- a/.github/workflows/ci_lint.yml +++ b/.github/workflows/ci_lint.yml @@ -3,7 +3,7 @@ on: pull_request: branches: [master, 'stabilization*'] permissions: - contents: read + contents: read jobs: yamllint: name: Yaml Lint on Changed yaml files From 02bffa89ecfdc176696c9f2be2b2528155c52d90 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 27 Mar 2026 14:16:33 +0100 Subject: [PATCH 5/5] fix lint errors in the yamllint configuration it self --- .yamllint | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.yamllint b/.yamllint index 0ea0118098df..7279f41e5e5c 100644 --- a/.yamllint +++ b/.yamllint @@ -11,10 +11,11 @@ rules: truthy: disable # do not check for strict true / false boolean values comments: disable # disable syntax checking of comments comments-indentation: disable # disable indentation checks for comments - document-start: disable # do not require the document start marker + document-start: disable # do not require the document start marker empty-lines: level: warning # only warn about empty lines indentation: - spaces: consistent # pass lint if spaces are used for indentation and multiple of spaces is consistent through a file + # pass if spaces are used for indentation and number of spaces is consistent through a file + spaces: consistent line-length: max: 99 # allow lines up to 99 chars