Merge branch 'zephyrproject-rtos:main' into auxdisplay_serlcd

zephyrproject-rtos · Nov 1, 2023 · 342090f · 342090f
2 parents 00f3809 + f9d71a2
commit 342090f
Show file tree

Hide file tree

Showing 491 changed files with 13,591 additions and 2,433 deletions.
diff --git a/.github/workflows/bsim-tests.yaml b/.github/workflows/bsim-tests.yaml
@@ -42,6 +42,7 @@ jobs:
       EDTT_PATH: ../tools/edtt
       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
@@ -134,15 +135,25 @@ 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_bt nice tests/bsim/bluetooth/compile.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} \
-          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.sh
-          # Run the BT controller tests also for the nrf5340
+          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 \
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bt nice tests/bsim/bluetooth/ll/compile.sh
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
           BOARD=nrf5340bsim_nrf5340_cpunet \
           RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \
-          SEARCH_PATH=tests/bsim/bluetooth/ll/ tests/bsim/run_parallel.sh
+          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'
@@ -160,6 +171,7 @@ jobs:
           path: |
             ./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

diff --git a/.github/workflows/coding_guidelines.yml b/.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: |

diff --git a/.github/workflows/compliance.yml b/.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: |
@@ -45,7 +45,7 @@ jobs:
         git log  --pretty=oneline | head -n 10
         west init -l . || true
         west config manifest.group-filter -- +ci,+optional
-        west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
+        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