(Auto-)Upmerge 20231010

.github/SECURITY.md

@@ -8,12 +8,12 @@ updates:
   - The most recent release, and the release prior to that.
   - Active LTS releases.
 
-At this time, with the latest release of v3.3, the supported
+At this time, with the latest release of v3.5, the supported
 versions are:
 
   - v2.7: Current LTS
-  - v3.2: Prior release
-  - v3.3: Current release
+  - v3.4: Prior release
+  - v3.5: Current release
 
 ## Reporting process
 

.github/workflows/bsim-tests.yaml

@@ -30,18 +30,20 @@ jobs:
     if: github.repository_owner == 'zephyrproject-rtos'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
-      bsim_bluetooth_test_results_file: ./bsim_bluetooth/bsim_results.xml
-      bsim_networking_test_results_file: ./bsim_net/bsim_results.xml
+      bsim_bt_52_test_results_file: ./bsim_bt/52_bsim_results.xml
+      bsim_bt_53_test_results_file: ./bsim_bt/53_bsim_results.xml
+      bsim_bt_53split_test_results_file: ./bsim_bt/53_bsim_split_results.xml
+      bsim_net_52_test_results_file: ./bsim_net/52_bsim_results.xml
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -133,16 +135,32 @@ jobs:
         if: steps.check-bluetooth-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
         run: |
           export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bluetooth nice tests/bsim/bluetooth/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bluetooth_test_results_file} \
-          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.sh
+          export WORK_DIR=${ZEPHYR_BASE}/bsim_bt
+          # Build and run the BT tests for nrf52_bsim:
+          nice tests/bsim/bluetooth/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_52_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf52bsim.txt tests/bsim/run_parallel.sh
+          # Build and run the BT controller tests also for the nrf5340bsim_nrf5340_cpunet
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt \
+          tests/bsim/run_parallel.sh
+          # Build and run the nrf5340 split stack tests set
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53split_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt \
+          tests/bsim/run_parallel.sh
 
       - name: Run Networking Tests with BSIM
         if: steps.check-networking-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
         run: |
           export ZEPHYR_BASE=${PWD}
           WORK_DIR=${ZEPHYR_BASE}/bsim_net nice tests/bsim/net/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_networking_test_results_file} \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_net_52_test_results_file} \
           SEARCH_PATH=tests/bsim/net/ tests/bsim/run_parallel.sh
 
       - name: Upload Test Results
@@ -151,8 +169,10 @@ jobs:
         with:
           name: bsim-test-results
           path: |
-            ./bsim_bluetooth/bsim_results.xml
-            ./bsim_net/bsim_results.xml
+            ./bsim_bt/52_bsim_results.xml
+            ./bsim_bt/53_bsim_results.xml
+            ./bsim_bt/53_bsim_split_results.xml
+            ./bsim_net/52_bsim_results.xml
             ${{ github.event_path }}
           if-no-files-found: warn
 

.github/workflows/clang.yaml

@@ -10,7 +10,7 @@ jobs:
   clang-build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -20,7 +20,7 @@ jobs:
         platform: ["native_posix"]
         subset: [1, 2, 3, 4, 5]
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
@@ -59,6 +59,7 @@ jobs:
           git log  --pretty=oneline | head -n 10
           west init -l . || true
           west config --global update.narrow true
+          west config manifest.group-filter -- +ci,+optional
           # In some cases modules are left in a state where they can't be
           # updated (i.e. when we cancel a job and the builder is killed),
           # So first retry to update, if that does not work, remove all modules

.github/workflows/codecov.yaml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'zephyrproject-rtos/zephyr'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
@@ -22,7 +22,7 @@ jobs:
       matrix:
         platform: ["native_posix", "qemu_x86", "unit_testing"]
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
     steps:
       - name: Apply container owner mismatch workaround
         run: |

.github/workflows/coding_guidelines.yml

@@ -17,7 +17,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-doc-pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
 
     - name: Install python dependencies
       run: |

.github/workflows/compliance.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-doc-pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
 
     - name: Install python dependencies
       run: |
@@ -44,7 +44,8 @@ jobs:
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
-        west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
+        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: Run Compliance Tests
       continue-on-error: true

.github/workflows/devicetree_checks.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.8, 3.9, '3.10']
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
         os: [ubuntu-22.04, macos-11, windows-2022]
         exclude:
         - os: macos-11

.github/workflows/doc-build.yml

@@ -26,7 +26,7 @@ on:
 
 env:
   # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.0.0
+  WEST_VERSION: 1.2.0
   # The latest CMake available directly with apt is 3.18, but we need >=3.20
   # so we fetch that through pip.
   CMAKE_VERSION: 3.20.5
@@ -35,7 +35,8 @@ env:
 jobs:
   doc-build-html:
     name: "Documentation Build (HTML)"
-    runs-on: ubuntu-22.04
+    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: zephyr-runner-linux-x64-4xlarge
     timeout-minutes: 45
     concurrency:
       group: doc-build-html-${{ github.ref }}
@@ -44,11 +45,26 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Rebase
+      if: github.event_name == 'pull_request'
+      continue-on-error: true
+      env:
+        BASE_REF: ${{ github.base_ref }}
+        PR_HEAD: ${{ github.event.pull_request.head.sha }}
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "Github Actions"
+        git rebase origin/${BASE_REF}
+        git log --graph --oneline HEAD...${PR_HEAD}
 
     - name: install-pkgs
       run: |
         sudo apt-get update
-        sudo apt-get install -y ninja-build graphviz
+        sudo apt-get install -y ninja-build graphviz lcov
         wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
         tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
         echo "${PWD}/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
@@ -65,6 +81,7 @@ jobs:
         pip3 install -r doc/requirements.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
+        pip3 install coverxygen
 
     - name: west setup
       run: |
@@ -84,28 +101,45 @@ jobs:
         else
           DOC_TARGET="html"
         fi
-
         DOC_TAG=${DOC_TAG} SPHINXOPTS_EXTRA="-q -t publish" make -C doc ${DOC_TARGET}
 
+        # API documentation coverage
+        python3 -m coverxygen --xml-dir  doc/_build/html/doxygen/xml/ --src-dir include/ --output doc-coverage.info
+        # deprecated page causing issues
+        lcov --remove doc-coverage.info \*/deprecated > new.info
+        genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
+
     - name: compress-docs
       run: |
         tar cfJ html-output.tar.xz --directory=doc/_build html
+        tar cfJ api-output.tar.xz --directory=doc/_build html/doxygen/html
+        tar cfJ api-coverage.tar.xz coverage-report
 
     - name: upload-build
       uses: actions/upload-artifact@v3
       with:
         name: html-output
         path: html-output.tar.xz
 
+    - name: upload-api-coverage
+      uses: actions/upload-artifact@v3
+      with:
+        name: api-coverage
+        path: api-coverage.tar.xz
+
     - name: process-pr
       if: github.event_name == 'pull_request'
       run: |
         REPO_NAME="${{ github.event.repository.name }}"
         PR_NUM="${{ github.event.pull_request.number }}"
         DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/"
+        API_DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/doxygen/html/"
+        API_COVERAGE_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/api-coverage/"
 
         echo "${PR_NUM}" > pr_num
         echo "Documentation will be available shortly at: ${DOC_URL}" >> $GITHUB_STEP_SUMMARY
+        echo "API Documentation will be available shortly at: ${API_DOC_URL}" >> $GITHUB_STEP_SUMMARY
+        echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
 
     - name: upload-pr-number
       uses: actions/upload-artifact@v3
@@ -116,7 +150,9 @@ jobs:
 
   doc-build-pdf:
     name: "Documentation Build (PDF)"
-    if: github.event_name != 'pull_request'
+    if: |
+      github.event_name != 'pull_request' &&
+      github.repository_owner == 'zephyrproject-rtos'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container: texlive/texlive:latest
     timeout-minutes: 60
@@ -125,6 +161,10 @@ jobs:
       cancel-in-progress: true
 
     steps:
+    - name: Apply container owner mismatch workaround
+      run: |
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
     - name: checkout
       uses: actions/checkout@v3