Merge branch 'zephyrproject-rtos:main' into separate_posix_message_pa…

…ssing_into_standalone_test

.checkpatch.conf

@@ -5,7 +5,6 @@
 --min-conf-desc-length=1
 --typedefsfile=scripts/checkpatch/typedefsfile
 
---ignore BRACES
 --ignore PRINTK_WITHOUT_KERN_LEVEL
 --ignore SPLIT_STRING
 --ignore VOLATILE

.clang-format

@@ -111,3 +111,4 @@ WhitespaceSensitiveMacros:
   - LISTIFY
   - STRINGIFY
   - Z_STRINGIFY
+  - DT_FOREACH_PROP_ELEM_SEP

.github/workflows/assigner.yml

@@ -24,8 +24,7 @@ jobs:
     steps:
     - name: Install Python dependencies
       run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -U PyGithub>=1.55 west
+        pip install -U PyGithub>=1.55 west
 
     - name: Check out source code
       uses: actions/checkout@v4

.github/workflows/backport_issue_check.yml

@@ -25,8 +25,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          sudo pip3 install -U setuptools wheel pip
-          pip3 install -U pygithub
+          pip install -U pygithub
 
       - name: Run backport issue checker
         env:

.github/workflows/bsim-tests.yaml

@@ -12,12 +12,13 @@ on:
       - "dts/*/nordic/**"
       - "tests/bluetooth/common/testlib/**"
       - "samples/bluetooth/**"
-      - "boards/posix/**"
-      - "soc/posix/**"
+      - "boards/native/**"
+      - "soc/native/**"
       - "arch/posix/**"
       - "include/zephyr/arch/posix/**"
       - "scripts/native_simulator/**"
       - "samples/net/sockets/echo_*/**"
+      - "modules/hal_nordic/**"
       - "modules/mbedtls/**"
       - "modules/openthread/**"
       - "subsys/net/l2/openthread/**"
@@ -77,6 +78,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10
@@ -96,15 +98,16 @@ jobs:
             .github/workflows/bsim-tests.yaml
             .github/workflows/bsim-tests-publish.yaml
             west.yml
-            boards/posix/
-            soc/posix/
+            boards/native/
+            soc/native/
             arch/posix/
             include/zephyr/arch/posix/
             scripts/native_simulator/
             tests/bsim/*
             boards/nordic/nrf5*/*dt*
             dts/*/nordic/
             modules/mbedtls/**
+            modules/hal_nordic/**
 
       - name: Check if Bluethooth files changed
         uses: tj-actions/changed-files@v45
@@ -169,7 +172,7 @@ jobs:
 
       - name: Merge Test Results
         run: |
-          pip3 install junitparser junit2html
+          pip install junitparser junit2html
           junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
           junit2html junit.xml junit.html
 

.github/workflows/bug_snapshot.yaml

@@ -25,8 +25,7 @@ jobs:
 
     - name: Install Python dependencies
       run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -U pygithub
+        pip install -U pygithub
 
     - name: Snapshot bugs
       env:

.github/workflows/clang.yaml

@@ -61,6 +61,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10
@@ -143,7 +144,7 @@ jobs:
           path: artifacts
       - name: Merge Test Results
         run: |
-          pip3 install junitparser junit2html
+          pip install junitparser junit2html
           junitparser merge artifacts/*/twister.xml junit.xml
           junit2html junit.xml junit-clang.html
 

.github/workflows/codecov.yaml

@@ -101,7 +101,7 @@ jobs:
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          pip3 install gcovr==6.0
+          pip install gcovr==6.0
           ./scripts/twister -E ${{matrix.normalized}}-testplan.json
           ls -la
           ./scripts/twister \
@@ -182,7 +182,7 @@ jobs:
       - name: Merge coverage files
         run: |
           pushd ./coverage/reports
-          pip3 install gcovr==6.0
+          pip install gcovr==6.0
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
           gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
           popd

.github/workflows/coding_guidelines.yml

@@ -21,9 +21,8 @@ jobs:
 
     - name: Install python dependencies
       run: |
-        pip3 install unidiff
-        pip3 install wheel
-        pip3 install sh
+        pip install unidiff
+        pip install sh
 
     - name: Install Packages
       run: |
@@ -40,6 +39,8 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "Github Actions"
         git remote -v
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
         git clean -f -d
         source zephyr-env.sh

.github/workflows/compliance.yml

@@ -23,6 +23,23 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
+    - name: Rebase onto the target branch
+      env:
+        BASE_REF: ${{ github.base_ref }}
+      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)
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
+        git rebase origin/${BASE_REF}
+        git clean -f -d
+        # debug
+        git log  --pretty=oneline | head -n 10
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
@@ -36,25 +53,11 @@ jobs:
 
     - name: Install python dependencies
       run: |
-        pip3 install setuptools
-        pip3 install wheel
-        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint clang-format unidiff sphinx-lint ruff
-        pip3 install west
+        pip install -r scripts/requirements-compliance.txt
+        pip install west
 
     - name: west setup
-      env:
-        BASE_REF: ${{ github.base_ref }}
       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}
-        git clean -f -d
-        # 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
@@ -79,7 +82,7 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e ClangFormat \
         -c origin/${BASE_REF}..
 
     - name: upload-results

.github/workflows/daily_test_version.yml

@@ -25,7 +25,7 @@ jobs:
 
     - name: install-pip
       run: |
-        pip3 install gitpython
+        pip install gitpython
 
     - name: checkout
       uses: actions/checkout@v4

.github/workflows/devicetree_checks.yml

@@ -62,8 +62,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: install python dependencies
       run: |
-        pip3 install wheel
-        pip3 install pytest pyyaml tox
+        pip install pytest pyyaml tox
     - name: run tox
       working-directory: scripts/dts/python-devicetree
       run: |

.github/workflows/do_not_merge.yml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   do-not-merge:
-    if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
-            contains(github.event.*.labels.*.name, 'TSC') ||
-            contains(github.event.*.labels.*.name, 'Architecture Review') ||
-            contains(github.event.*.labels.*.name, 'dev-review') }}
     name: Prevent Merging
     runs-on: ubuntu-22.04
     steps:
       - name: Check for label
+        if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
+                contains(github.event.*.labels.*.name, 'TSC') ||
+                contains(github.event.*.labels.*.name, 'Architecture Review') ||
+                contains(github.event.*.labels.*.name, 'dev-review') }}
         run: |
           echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
           echo "This workflow fails so that the pull request cannot be merged."

.github/workflows/doc-build.yml

@@ -94,6 +94,8 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Github Actions"
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
         git clean -f -d
         git log --graph --oneline HEAD...${PR_HEAD}
@@ -106,11 +108,10 @@ jobs:
 
     - name: install-pip
       run: |
-        sudo pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
-        pip3 install west==${WEST_VERSION}
-        pip3 install cmake==${CMAKE_VERSION}
-        pip3 install coverxygen
+        pip install -r doc/requirements.txt
+        pip install west==${WEST_VERSION}
+        pip install cmake==${CMAKE_VERSION}
+        pip install coverxygen
 
     - name: west setup
       run: |
@@ -221,10 +222,9 @@ jobs:
 
     - name: install-pip
       run: |
-        pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
-        pip3 install west==${WEST_VERSION}
-        pip3 install cmake==${CMAKE_VERSION}
+        pip install -r doc/requirements.txt
+        pip install west==${WEST_VERSION}
+        pip install cmake==${CMAKE_VERSION}
 
     - name: west setup
       run: |

.github/workflows/footprint-tracking.yml

@@ -58,7 +58,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y python3-venv
-          sudo pip3 install -U setuptools wheel pip gitpython
+          pip install -U gitpython
 
       - name: checkout
         uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
         run: |
           python3 -m venv .venv
           . .venv/bin/activate
-          pip3 install awscli
+          pip install awscli
           aws s3 sync  --quiet footprint_data/ s3://testing.zephyrproject.org/footprint_data/
 
       - name: Transform Footprint data to Twister JSON reports
@@ -113,7 +113,7 @@ jobs:
           ELASTICSEARCH_INDEX: ${{ vars.FOOTPRINT_TRACKING_INDEX }}
         run: |
           shopt -s globstar
-          pip3 install -U elasticsearch
+          pip install -U elasticsearch
           run_date=`date --iso-8601=minutes`
           python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
             --flatten footprint \

.github/workflows/hello_world_multiplatform.yaml

@@ -12,8 +12,7 @@ on:
       - v*-branch
       - collab-*
     paths:
-      - 'scripts/build/**'
-      - 'scripts/requirements*.txt'
+      - 'scripts/**'
       - '.github/workflows/hello_world_multiplatform.yaml'
       - 'SDK_VERSION'
 
@@ -45,6 +44,8 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Github Actions"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log --graph --oneline HEAD...${PR_HEAD}

.github/workflows/manifest.yml

@@ -20,13 +20,13 @@ jobs:
           BASE_REF: ${{ github.base_ref }}
         working-directory: zephyrproject/zephyr
         run: |
-          pip3 install west
+          pip install west
           git config --global user.email "[email protected]"
           git config --global user.name "Your Name"
           west init -l . || true
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.5.0
+        uses: zephyrproject-rtos/action-manifest@v1.7.0
         with:
           github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
           manifest-path: 'west.yml'

.github/workflows/pylib_tests.yml

@@ -44,7 +44,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: install-packages
       run: |
-        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
+        pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
     - name: Run pytest for build_helpers
       env:
         ZEPHYR_BASE: ./

.github/workflows/scripts_tests.yml

@@ -42,6 +42,8 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Github Actions"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log --graph --oneline HEAD...${PR_HEAD}
@@ -62,7 +64,7 @@ jobs:
 
       - name: install-packages
         run: |
-          pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
+          pip install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
 
       - name: Run pytest
         env:

.github/workflows/stats_merged_prs.yml

@@ -20,5 +20,5 @@ jobs:
           ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
           PR_STAT_ES_INDEX: ${{ vars.PR_STAT_ES_INDEX }}
         run: |
-          pip3 install pygithub elasticsearch
+          pip install pygithub elasticsearch
           python3 ./scripts/ci/stats/merged_prs.py --pull-request ${{ github.event.pull_request.number }} --repo ${{ github.repository }}

.github/workflows/twister-prep.yaml

@@ -67,6 +67,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10