Merge branch 'main' into new_theme_1.0.0

Author: b-gent

.github/test-spec.yml

@@ -30,8 +30,7 @@
   - "applications/firmware_loader/**/*"
   - "boards/**/*"
   - "cmake/**/*"
-  - "components/softdevice/s115/**/*"
-  - "components/softdevice/s145/**/*"
+  - "components/softdevice/**/*"
   - "drivers/**/*"
   - "include/**/*"
   - "lib/**/*"

.github/workflows/build_samples.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     types: [push, opened, reopened, synchronize]
 
+  schedule:
+    - cron: "0 4 * * 1-5"
+
   workflow_dispatch:
 
 jobs:
@@ -42,25 +45,39 @@ jobs:
           west init -l nrf-bm
           west update -o=--depth=1 -n
 
-      - name: Build samples
+      - name: Build samples on commit
+        if: github.event.pull_request
+        working-directory: nrf-bm
+        run: |
+          west twister -T samples --build-only -vc --inline-logs --integration --subset 1/2
+          west twister -T samples --build-only -vc --inline-logs --integration --subset 2/2
+
+      - name: Build samples nightly
+        if: ${{ github.event.schedule || github.event.workflow_dispatch }}
         working-directory: nrf-bm
+        # Split the run into multiple calls as we have limited space for the workflow
         run: |
-          west twister -T samples --build-only -v --inline-logs --integration
+          west twister -T samples --build-only -vc --inline-logs --subset 1/15
+          west twister -T samples --build-only -vc --inline-logs --subset 2/15
+          west twister -T samples --build-only -vc --inline-logs --subset 3/15
+          west twister -T samples --build-only -vc --inline-logs --subset 4/15
+          west twister -T samples --build-only -vc --inline-logs --subset 5/15
+          west twister -T samples --build-only -vc --inline-logs --subset 6/15
+          west twister -T samples --build-only -vc --inline-logs --subset 7/15
+          west twister -T samples --build-only -vc --inline-logs --subset 8/15
+          west twister -T samples --build-only -vc --inline-logs --subset 9/15
+          west twister -T samples --build-only -vc --inline-logs --subset 10/15
+          west twister -T samples --build-only -vc --inline-logs --subset 11/15
+          west twister -T samples --build-only -vc --inline-logs --subset 12/15
+          west twister -T samples --build-only -vc --inline-logs --subset 13/15
+          west twister -T samples --build-only -vc --inline-logs --subset 14/15
+          west twister -T samples --build-only -vc --inline-logs --subset 15/15
 
       - name: upload-logs
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: ${{ failure() && !contains(github.event.pull_request.user.login, 'dependabot[bot]') }}
         with:
           name: build-logs
-          path: nrf-bm/twister-out/**/*.log
-          retention-days: 5
-
-      - name: upload-artifacts-dispatch
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
-        if: contains(github.event.pull_request.user.login, 'dependabot[bot]') != true &&
-            github.event_name == 'workflow_dispatch'
-        with:
-          name: build-artifacts
           path: nrf-bm/twister-out/**
           retention-days: 5
 

.github/workflows/compliance.yml

@@ -29,14 +29,22 @@ jobs:
           key: ${{ runner.os }}-doc-pip
 
       - name: Install python dependencies
-        working-directory: ncs/nrf
+        working-directory: ncs/zephyr
         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|^pykwalify|^yamllint|^unidiff|^vermin|^python-dotenv|^ruff|^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
+          pip install -r scripts/requirements-compliance.txt
+
+      - name: Setup Node.js
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        with:
+          node-version: "lts/*"
+          cache: npm
+          check-latest: true
+          cache-dependency-path: ./ncs/zephyr/scripts/ci/package-lock.json
+
+      - name: Install Node dependencies
+        run: npm --prefix ./ncs/zephyr/scripts/ci ci
 
       - name: Run merge commits test
         env:
@@ -75,9 +83,8 @@ jobs:
           ls -la
           git log --pretty=oneline | head -n 10
           $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate \
-          -e KconfigBasicNoModules -e ClangFormat \
-          -e SysbuildKconfigBasicNoModules \
-          -c origin/${BASE_REF}..
+          -e KconfigBasicNoModules -e ClangFormat -e SysbuildKconfigBasicNoModules \
+          -e LicenseAndCopyrightCheck -e BinaryFiles -c origin/${BASE_REF}..
 
       - name: upload-results
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4

.github/workflows/docpublish.yml

@@ -20,32 +20,41 @@ jobs:
       - name: Unzip html archive
         working-directory: docs
         run: |
-          OUTDIR=$(awk 'NR==1 { if ($3 ~ /^(latest|PR-[0-9]+|[0-9]+\.[0-9a-zA-Z\.\-]+)$/) print $3 }' monitor_*.txt)
+          OUTDIR=ncs-bm/$(awk 'NR==1 { if ($3 ~ /^(latest|PR-[0-9]+|[0-9]+\.[0-9a-zA-Z\.\-]+)$/) print $3 }' monitor_*.txt)
+          mkdir -p "$OUTDIR"
           echo "OUTDIR=$OUTDIR" >> "$GITHUB_ENV"
           unzip legacy-ncs*.zip -d $OUTDIR
+          find "$OUTDIR" -type l -delete
 
       - name: Obtain PR number
         if: ${{ github.event.workflow_run.event == 'pull_request' }}
         working-directory: docs
         run: |
-          echo "PR=$(cat pr.txt)" >> "$GITHUB_ENV"
+          if [ -f pr.txt ]; then
+            PR=$(head -n 1 pr.txt | tr -cd '0-9')
+          fi
+          printf 'PR=%s\n' "$PR" >> "$GITHUB_ENV"
 
       - name: Upload to Azure storage
         working-directory: docs
         env:
           AZCOPY_CONCURRENCY_VALUE: 1024
+          NCS_DOC_SAS_PRS: ${{ secrets.NCS_DOC_SAS_PRS }}
+          NCS_DOC_SAS_MAIN: ${{ secrets.NCS_DOC_SAS_MAIN }}
         run: |
-         azcopy cp $OUTDIR "${{ vars.NCS_DOC_STORAGE_URL }}?${{ secrets.NCS_DOC_SAS}}" --recursive=true
+          if [[ "${{ github.event.workflow_run.event }}" == "pull_request" ]]; then
+            NCS_BM_DOC_STORAGE_URL="${{ vars.NCS_DOC_PR_STORAGE_URL }}"
+            azcopy cp ncs-bm "$NCS_BM_DOC_STORAGE_URL?$NCS_DOC_SAS_PRS" --recursive=true
+          else
+            NCS_BM_DOC_STORAGE_URL="${{ vars.NCS_DOC_STORAGE_URL }}"
+            azcopy cp ncs-bm "$NCS_BM_DOC_STORAGE_URL?$NCS_DOC_SAS_MAIN" --recursive=true
+          fi
 
       - name: Upload Zoomin documentation
+        if: >
+          github.event.workflow_run.head_branch == 'main' &&
+          github.event.workflow_run.head_repository.full_name == github.repository
         run: |
-          for file in docs/monitor*.txt; do
-            if ! grep -q main ${file}; then
-              echo "Not targeting main, skipping Zoomin upload"
-              exit 0
-            fi
-          done
-
           # trust server
           mkdir -p ~/.ssh
           ssh-keyscan upload-v1.zoominsoftware.io >> ~/.ssh/known_hosts

.github/workflows/docs.yml

@@ -70,15 +70,20 @@ jobs:
           # Create documentation upload files
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
             ARCHIVE="legacy-ncs-pr-${{ github.event.number }}.zip"
-            echo "publish2 dev PR-${{ github.event.number }} ${ARCHIVE}" > "${MONITOR}"
-            echo "${{ github.event.number }}" > pr.txt
           else
             ARCHIVE="legacy-ncs-${VERSION}.zip"
-            echo "publish2 main ${VERSION} ${ARCHIVE}" > "${MONITOR}"
           fi
 
           zip -rq "${ARCHIVE}" .
 
+          # Create monitor/pr files after zip to avoid including them in the archive
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            echo "publish2 dev PR-${{ github.event.number }} ${ARCHIVE}" > "${MONITOR}"
+            echo "${{ github.event.number }}" > pr.txt
+          else
+            echo "publish2 main ${VERSION} ${ARCHIVE}" > "${MONITOR}"
+          fi
+
       - name: Prepare Zoomin upload
         if: ${{ github.event_name == 'push' }}
         working-directory: sdk-nrf-bm/nrf-bm
@@ -90,7 +95,7 @@ jobs:
           declare -a SPHINX_DOXYGEN=("nrf-bm")
 
           # Doxygen APIs standalone
-          declare -a DOXYGEN=("s115" "s145")
+          declare -a DOXYGEN=("s115_nrf54l15" "s145_nrf54l15" "s115_nrf54lm20" "s145_nrf54lm20" "s115_nrf54ls05" "s145_nrf54ls05" "s115_nrf54lv10" "s145_nrf54lv10")
 
           mkdir doc/_build/html-doxygen
 
@@ -161,7 +166,7 @@ jobs:
         working-directory: sdk-nrf-bm/nrf-bm
         run: |
           COMMENT="comment.txt"
-          PREFIX="https://ncsbmdoc.z6.web.core.windows.net/PR-${{ github.event.pull_request.number }}/"
+          PREFIX="https://ncsbmdoc.z6.web.core.windows.net/ncs-bm/PR-${{ github.event.pull_request.number }}/"
 
           echo "You can find the documentation preview for this PR [here](${PREFIX})." >> $COMMENT
 

.github/workflows/manifest.yml

@@ -11,10 +11,9 @@ jobs:
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           path: ncs/nrf-bm
-          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
@@ -29,7 +28,7 @@ jobs:
           west init -l . || true
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@ea38f222cddfbbb9debb5f0239f4139ae2677ebb # v1.8.0
+        uses: zephyrproject-rtos/action-manifest@09983f53d3d878791aa37a7755ae44d695f4c1e5 # v2.0.0
         with:
           github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
           manifest-path: 'west.yml'

.github/workflows/src-mirror.yml

@@ -39,4 +39,4 @@ jobs:
           artifactory-pass: ${{ secrets.COM_NORDICSEMI_FILES_PASSWORD }}
           stable: ${{ env.STABLE }}
           repository-type: 'nrf-bm'
-          toolchain-version: 'v3.2.0'
+          toolchain-version: 'v3.3.0'

.github/workflows/twister.yml

@@ -13,7 +13,7 @@ jobs:
       - runs-on=${{ github.run_id }}
       - runner=64cpu-linux-x64
     # Keep aligned with target NCS version
-    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.2.0
+    container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.3.0
     defaults:
       run:
         # Bash shell is needed to set toolchain related environment variables in docker container

.gitlint

@@ -0,0 +1,60 @@
+# All these sections are optional, edit this file as you like.
+[general]
+ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
+# verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
+verbosity = 3
+# By default gitlint will ignore merge commits. Set to 'false' to disable.
+ignore-merge-commits=false
+ignore-revert-commits=false
+ignore-fixup-commits=false
+ignore-squash-commits=false
+# Enable debug mode (prints more output). Disabled by default
+debug = false
+
+# Set the extra-path where gitlint will search for user defined rules
+# See http://jorisroovers.github.io/gitlint/user_defined_rules for details
+extra-path=../zephyr/scripts/gitlint
+
+[title-max-length-no-revert]
+line-length=75
+
+[body-min-line-count]
+min-line-count=1
+
+[body-max-line-count]
+max-line-count=200
+
+[title-starts-with-subsystem]
+regex = ^(?!subsys:)(([^:]+):)(\s([^:]+):)*\s(.+)$
+
+[title-must-not-contain-word]
+# Comma-separated list of words that should not occur in the title. Matching is case
+# insensitive. It's fine if the keyword occurs as part of a larger word (so "WIPING"
+# will not cause a violation, but "WIP: my title" will.
+words=wip
+
+[title-match-regex]
+# python like regex (https://docs.python.org/2/library/re.html) that the
+# commit-msg title must be matched to.
+# Note that the regex can contradict with other rules if not used correctly
+# (e.g. title-must-not-contain-word).
+#regex=^US[0-9]*
+
+[max-line-length-with-exceptions]
+# B1 = body-max-line-length
+line-length=72
+
+[body-min-length]
+min-length=3
+
+[body-is-missing]
+# Whether to ignore this rule on merge commits (which typically only have a title)
+# default = True
+ignore-merge-commits=false
+
+[body-changed-file-mention]
+# List of files that need to be explicitly mentioned in the body when they are changed
+# This is useful for when developers often erroneously edit certain files or git submodules.
+# By specifying this rule, developers can only change the file when they explicitly reference
+# it in the commit message.
+#files=gitlint/rules.py,README.md

CODEOWNERS

@@ -44,7 +44,8 @@
 /include/*.h                              @nrfconnect/ncs-bm
 /include/bm/                              @nrfconnect/ncs-bm
 /include/bm/bluetooth/                    @nrfconnect/ncs-bm
-/include/bm/settings/                     @nrfconnect/ncs-eris
+/include/bm/shell/                        @nrfconnect/ncs-bm
+/include/bm/storage/bm_rmem.h             @nrfconnect/ncs-eris
 
 # Libraries
 /lib/bluetooth/ble_adv/                   @nrfconnect/ncs-bm
@@ -58,6 +59,7 @@
 /lib/bluetooth/ble_scan/                  @nrfconnect/ncs-bm
 /lib/bluetooth/peer_manager/              @nrfconnect/ncs-bm
 /lib/bm_buttons/                          @nrfconnect/ncs-bm
+/lib/bm_gpiote/                           @nrfconnect/ncs-bm
 /lib/bm_timer/                            @nrfconnect/ncs-bm
 /lib/boot_banner/                         @nrfconnect/ncs-bm
 /lib/bm_scheduler/                        @nrfconnect/ncs-bm
@@ -79,7 +81,7 @@
 
 # Scripts
 /scripts/                                 @nrfconnect/ncs-bm
-/scripts/pytest_plugins/                  @nrfconnect/ncs-eris
+/scripts/pytest_plugins/                  @nrfconnect/ncs-eris @nrfconnect/ncs-eris-test
 /scripts/requirements-*.txt               @nrfconnect/ncs-co-build-system
 
 # Subsystems
@@ -89,30 +91,35 @@
 /subsys/logging/                          @nrfconnect/ncs-bm
 /subsys/mgmt/mcumgr/                      @nrfconnect/ncs-eris
 /subsys/nfc/                              @nrfconnect/ncs-bm
-/subsys/settings/                         @nrfconnect/ncs-eris
+/subsys/shell/                            @nrfconnect/ncs-bm
 /subsys/softdevice/                       @nrfconnect/ncs-bm
 /subsys/softdevice_handler/               @nrfconnect/ncs-bm
 /subsys/storage/bm_storage/               @nrfconnect/ncs-bm
+/subsys/storage/ble_rmem/                 @nrfconnect/ncs-eris
+/subsys/storage/bm_rmem/                  @nrfconnect/ncs-eris
 /subsys/storage/flash_map/                @nrfconnect/ncs-eris
 
 # Sysbuild
 /sysbuild/                                @nrfconnect/ncs-co-build-system
 
 # Tests
-/tests/lib/                               @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_adv/             @nrfconnect/ncs-bm-test
-/tests/lib/bluetooth/ble_conn_params/     @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_conn_state/      @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_gq/              @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_db_discovery/    @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_qwr/             @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_racp/            @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_radio_notif/     @nrfconnect/ncs-bm
-/tests/lib/bluetooth/ble_scan/            @nrfconnect/ncs-bm
-/tests/subsys/bluetooth/services/         @nrfconnect/ncs-bm @nrfconnect/ncs-bm-test
-/tests/subsys/fs/bm_zms/                  @nrfconnect/ncs-bm @rghaddab
-/tests/subsys/kmu/                        @nrfconnect/ncs-eris
-/tests/subsys/storage/bm_storage/         @nrfconnect/ncs-bm
+/tests/lib/                                 @nrfconnect/ncs-bm
+/tests/subsys/fs/bm_zms/                    @nrfconnect/ncs-bm @rghaddab
+/tests/subsys/kmu/                          @nrfconnect/ncs-eris @nrfconnect/ncs-eris-test
+/tests/unit/lib/                            @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_adv/          @nrfconnect/ncs-bm-test
+/tests/unit/lib/bluetooth/ble_conn_params/  @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_conn_state/   @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_gq/           @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_db_discovery/ @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_qwr/          @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_racp/         @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_radio_notif/  @nrfconnect/ncs-bm
+/tests/unit/lib/bluetooth/ble_scan/         @nrfconnect/ncs-bm
+/tests/unit/subsys/bluetooth/services/      @nrfconnect/ncs-bm @nrfconnect/ncs-bm-test
+/tests/subsys/bootloader/upgrade/           @nrfconnect/ncs-eris @nrfconnect/ncs-eris-test
+/tests/subsys/storage/bm_rmem/              @nrfconnect/ncs-eris @nrfconnect/ncs-eris-test
+/tests/unit/subsys/storage/bm_storage*/     @nrfconnect/ncs-bm
 
 # Zephyr module
 /zephyr/                                  @nrfconnect/ncs-co-build-system