test: test

test DNR

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

.github/workflows/compliance.yml

@@ -1,112 +1,95 @@
 name: Compliance
 
-#  Controls when the workflow will run
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+on: pull_request
 
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+permissions:
+  contents: read
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   compliance_job:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Run compliance checks on patch series (PR)
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - name: Checkout the code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout sources
+      uses: nrfconnect/action-checkout-west-update@main
       with:
-        path: nrf-bm
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
+        git-fetch-depth: 0
+        git-ref: ${{ github.event.pull_request.head.sha }}
+        rebase: true
+        path: ncs/nrf-bm
 
     - name: cache-pip
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-doc-pip
 
-    - name: Install python prerequisites
-      working-directory: nrf-bm
-      run: |
-        export PATH="$HOME/.local/bin:$PATH"
-        pip3 install -U -r scripts/requirements.txt
-        pip3 show -f west
-
-    - name: West init and update
-      env:
-        BASE_REF: ${{ github.base_ref }}
-      working-directory: nrf-bm
-      run: |
-        git config --global user.email "[email protected]"
-        git config --global user.name "Your Name"
-        git remote -v
-        # Ensure there's no merge commits in the PR
-        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        #(echo "::error ::Merge commits not allowed, rebase instead";false)
-        git rebase origin/${BASE_REF}
-        # debug
-        git log  --pretty=oneline | head -n 10
-        west init -l . || true
-        west config manifest.group-filter -- +ci,-optional
-        west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
-
     - name: Install python dependencies
-      working-directory: nrf
+      working-directory: ncs/nrf
       run: |
         pip3 install -U pip
         pip3 install -U wheel
         grep -E "^setuptools" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
-        grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^python-dotenv|^tabulate|^pykwalify|^yamllint|^unidiff" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
+        grep -E "^python-magic=|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff|^vermin|^python-dotenv|^tabulate" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
         grep -E "^west" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
         pip3 show -f west
 
+    - name: Run merge commits test
+      env:
+        BASE_REF: ${{ github.base_ref }}
+      working-directory: ncs/nrf-bm
+      run: |
+        # Ensure there's no merge commits in the PR
+        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        (echo "::error ::Merge commits not allowed, rebase instead";false)
+
     - name: Run CODEOWNERS test
       id: codeowners
       env:
         BASE_REF: ${{ github.base_ref }}
-      working-directory: nrf-bm
+      working-directory: ncs/nrf-bm
       if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
       run: |
         ../nrf/scripts/ci/codeowners.py -c origin/${BASE_REF}..
 
+    - name: Get NCS modules needed for compliance tests to run
+      working-directory: ncs/nrf-bm
+      run: |
+        patch -p1 < scripts/ci/ci-compliance.diff
+        west update
+
     - name: Run Compliance Tests
       continue-on-error: true
       id: compliance
       env:
         BASE_REF: ${{ github.base_ref }}
-      working-directory: nrf-bm
+      working-directory: ncs/nrf-bm
       if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
       run: |
         export ZEPHYR_BASE="$(dirname "$(pwd)")/zephyr"
         # debug
         ls -la
         git log --pretty=oneline | head -n 10
-        exec 2> compliance_errors.txt
         $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate \
-        -e KconfigBasicNoModules -e ClangFormat -e SysbuildKconfigBasicNoModules \
+        -e KconfigBasicNoModules -e ClangFormat \
+        -e SysbuildKconfigBasicNoModules \
         -c origin/${BASE_REF}..
-        if [[ $? -ne 0 ]]; then
-          echo "$?" >&2
-        fi
 
     - name: upload-results
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-      continue-on-error: True
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
+      continue-on-error: true
       if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
       with:
         name: compliance.xml
-        path: nrf-bm/compliance.xml
+        path: ncs/nrf-bm/compliance.xml
         overwrite: true
 
     - name: check-warns
-      working-directory: nrf-bm
+      working-directory: ncs/nrf-bm
       if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true
       run: |
         export ZEPHYR_BASE="$(dirname "$(pwd)")/zephyr"

scripts/ci/ci-compliance.diff

@@ -0,0 +1,17 @@
+diff --git a/west.yml b/west.yml
+index 14a19d9..156cee6 100644
+--- a/west.yml
++++ b/west.yml
+@@ -32,6 +32,13 @@ manifest:
+           - zephyr
+           - cmock
+           - zcbor
++          # For compliance CI testing only
++          - matter
++          - openthread
++          - azure-sdk-for-c
++          - trusted-firmware-m
++          - memfault-firmware-sdk
++          - cjson
+     - name: sdk-nrf-bm-internal
+       path: nrf-bm-internal