Merge branch 'master' into p-remove-coap_pkt-token

RIOT-OS · Oct 5, 2022 · 3c7ebf8 · 3c7ebf8
2 parents 6fe787e + d7d9193
commit 3c7ebf8
Show file tree

Hide file tree

Showing 2,674 changed files with 86,521 additions and 183,312 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,9 @@
+# Between RIOT releases, this file points all projects in the tree to git
+# versions (still respecting Cargo.lock).
+#
+# Authors of out-of-tree applications can use the same lines in their
+# Cargo.toml, copy this file over, or just use the released versions.
+
+[patch.crates-io]
+#riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" }
+#riot-wrappers = { git = "https://github.com/RIOT-OS/rust-riot-wrappers" }
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -38,7 +38,7 @@ Please paste or specifically describe the actual output.
 
 #### Versions
 <!--
-Operating system: Mac OSX, Linux, Vagrant VM
+Operating system: macOS, Linux, Vagrant VM
 Build environment: GCC, CLang versions (you can run the following command from
 the RIOT base directory: make print-versions).
 -->

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -17,9 +17,9 @@
   - "**/*.mk"
 
 "Area: CI":
-  - ".circleci/**/*"
   - ".github/**/*.yml"
   - ".murdock"
+  - ".murdock.yml"
 
 "Area: CoAP":
   - "sys/net/application_layer/*coap/**/*"
@@ -142,10 +142,6 @@
 "Platform: ESP":
   - "cpu/esp*/**/*"
 
-"Platform: MIPS":
-  - "cpu/mips*/**/*"
-  - "makefiles/arch/mips.inc.mk"
-
 "Platform: MSP":
   - "cpu/msp*/**/*"
   - "makefiles/arch/msp430.inc.mk"

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -116,6 +116,11 @@ jobs:
       if: ${{ matrix.pytest_mark == 'not iotlab_creds' }}
       run: |
         sudo RIOT/dist/tools/tapsetup/tapsetup -c 11
+    - name: Install native dependencies
+      if: ${{ matrix.pytest_mark == 'not iotlab_creds' }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install lib32asan5
     - name: Run release tests
       timeout-minutes: 350
       run: |

diff --git a/.github/workflows/test-on-iotlab.yml b/.github/workflows/test-on-iotlab.yml
@@ -36,15 +36,11 @@ jobs:
           - riot: dwm1001
             iotlab:
               archi: dwm1001:dw1000
-              site: saclay
+              site: lille
           - riot: iotlab-m3
             iotlab:
               archi: m3:at86rf231
               site: saclay
-          - riot: nrf51dk
-            iotlab:
-              archi: nrf51dk:ble
-              site: saclay
           - riot: nrf52dk
             iotlab:
               archi: nrf52dk:ble
@@ -53,10 +49,6 @@ jobs:
             iotlab:
               archi: nrf52840dk:multi
               site: saclay
-          - riot: nrf52832-mdk
-            iotlab:
-              archi: nrf52832mdk:ble
-              site: saclay
           - riot: nucleo-wl55jc
             iotlab:
               archi: nucleo-wl55jc:stm32wl

diff --git a/.github/workflows/tools-buildtest.yml b/.github/workflows/tools-buildtest.yml
@@ -39,10 +39,6 @@ jobs:
       uses: aabadie/riot-action@v1
       with:
         cmd: make -C dist/tools/edbg
-    - name: Build pic32prog standalone
-      uses: aabadie/riot-action@v1
-      with:
-        cmd: make -C dist/tools/pic32prog
     - name: Build setsid standalone
       uses: aabadie/riot-action@v1
       with:

diff --git a/.murdock b/.murdock
@@ -5,8 +5,19 @@
 # and / or
 #export APPS="examples/hello-world tests/unittests"
 
-#
-: ${TEST_BOARDS_AVAILABLE:="esp32-wroom-32 samr21-xpro"}
+# this configures boards that are available via pifleet
+case "${CI_MURDOCK_PROJECT}" in
+    riot)
+        : ${TEST_BOARDS_AVAILABLE:="esp32-wroom-32 samr21-xpro"}
+        ;;
+    riot-staging)
+        : ${TEST_BOARDS_AVAILABLE:=""}
+        ;;
+    *)
+        : ${TEST_BOARDS_AVAILABLE:=""}
+        ;;
+esac
+
 #: ${EMULATED_BOARDS_AVAILABLE:="microbit"}
 
 # temporarily disabling llvm builds until https://github.com/RIOT-OS/RIOT/pull/15595
@@ -34,6 +45,13 @@ derfmega128
 dwm1001
 esp32-ci
 esp32-heltec-lora32-v2
+esp32-olimex-evb
+esp32c3-ci
+esp32c3-devkit
+esp32s3-ci
+esp32s3-devkit
+esp32s2-ci
+esp32s2-devkit
 esp8266-ci
 esp8266-esp-12x
 hamilton
@@ -58,6 +76,7 @@ nucleo-l073rz
 nucleo-l152re
 nucleo-l433rc
 nucleo-l552ze-q
+pba-d-01-kw2x
 p-nucleo-wb55
 qn9080dk
 remote-revb
@@ -70,6 +89,7 @@ slwstk6220a
 stm32f723e-disco
 stm32mp157c-dk2
 waspmote-pro
+waveshare-nrf52840-eval-kit
 weact-f401ce
 z1
 "}
@@ -112,8 +132,6 @@ tests/ieee802154_hal
 # Eventually this list will be removed...
 #
 : ${TEST_KCONFIG_BOARD_BLOCKLIST:="
-6lowpan-clicker
-pic32-wifire
 "}
 
 # This list will force all boards that are not in the TEST_KCONFIG_BOARD_BLOCKLIST
@@ -134,8 +152,8 @@ export CFLAGS_DBG=""
 export DLCACHE_DIR=${DLCACHE_DIR:-~/.dlcache}
 export ENABLE_TEST_CACHE=${ENABLE_TEST_CACHE:-1}
 export MURDOCK_REDIS_HOST=${MURDOCK_REDIS_HOST:-127.0.0.1}
+
 NIGHTLY=${NIGHTLY:-0}
-RUN_TESTS=${RUN_TESTS:-${NIGHTLY}}
 FULL_BUILD=${FULL_BUILD:-${NIGHTLY}}
 
 # This is a work around for a bug in CCACHE which interacts very badly with
@@ -157,7 +175,8 @@ export OPTIONAL_CFLAGS_BLACKLIST="-gz"
 
 DWQ_ENV="-E BOARDS -E APPS -E NIGHTLY -E RUN_TESTS -E ENABLE_TEST_CACHE
          -E TEST_HASH -E CI_PULL_LABELS -ECI_BASE_BRANCH -ECI_BASE_COMMIT
-         -EPKG_USE_MIRROR -EAPPS_CHANGED -EBOARDS_CHANGED -ESTATIC_TESTS"
+         -EPKG_USE_MIRROR -EAPPS_CHANGED -EBOARDS_CHANGED -ESTATIC_TESTS
+         -E CI_MURDOCK_PROJECT"
 
 if [ ${NIGHTLY} -eq 1 ]; then
     export PKG_USE_MIRROR=0
@@ -220,9 +239,16 @@ check_label() {
     return $?
 }
 
-[ "$RUN_TESTS" != "1" ] && {
-    check_label "CI: run tests" && RUN_TESTS=1
-}
+# if RUN_TESTS is unset (e.g., not passed from the outside),
+# set to 1 if NIGHTLY=1 or if the label "CI: run tests" is set,
+# otherwise set 0.
+if [ -z "$RUN_TESTS" ]; then
+    if [ "$NIGHTLY" = "1" ] || check_label "CI: run tests" ; then
+        RUN_TESTS=1
+    else
+        RUN_TESTS=0
+    fi
+fi
 
 [ "$ENABLE_TEST_CACHE" = "1" ] && {
     check_label "CI: disable test cache" && export ENABLE_TEST_CACHE=0
@@ -363,7 +389,7 @@ get_app_board_toolchain_pairs() {
     local prefix="$*"
 
     if [ "$boards" = makefile_broken ]; then
-        echo "$appdir makefile_broken"
+        echo "$0 error \"error: ${DWQ_WORKER}: get_supported_boards failed in $appdir\""
         return
     fi
 
@@ -452,31 +478,55 @@ compile() {
 
     if get_supported_kconfig_board_app "${board}" "${appdir}"; then
         should_check_kconfig_hash=1
-        BOARD=${board} make -C${appdir} clean
-        CCACHE_BASEDIR="$(pwd)" BOARD=${board} TOOLCHAIN=${toolchain} RIOT_CI_BUILD=1 TEST_KCONFIG=1 \
-                        make -C${appdir} all test-input-hash -j${JOBS:-4}
-        RES=$?
-        if [ $RES -eq 0 ]; then
-            kconfig_test_hash=$(test_hash_calc "${BINDIR}")
-        else
-            kconfig_test_hash=0
-            echo "An error occurred while compiling using Kconfig";
+        # As we have some issues with occasional unrelated hash mismatches
+        # we will stop the binary checks and rely only in a module/package
+        # check to ensure kconfig is matching make.
+        # Only nightlies will check the hash...
+        # Once we figure out the problem we can check the hashes again or
+        # better yet just finish!
+        if [ ${NIGHTLY} -eq 1 ]; then
+            BOARD=${board} make -C${appdir} clean
+            CCACHE_BASEDIR="$(pwd)" BOARD=${board} TOOLCHAIN=${toolchain} RIOT_CI_BUILD=1 TEST_KCONFIG=1 \
+                            make -C${appdir} all test-input-hash -j${JOBS:-4}
+            RES=$?
+            if [ $RES -eq 0 ]; then
+                kconfig_hashes="$(cat ${BINDIR}/test-input-hash.sha1)"
+            else
+                kconfig_hashes="kconfig-build-failed"
+                echo "An error occurred while compiling using Kconfig";
+            fi
         fi
     fi
 
     # compile without Kconfig
+    BOARD=${board} make -C${appdir} clean
     CCACHE_BASEDIR="$(pwd)" BOARD=$board TOOLCHAIN=$toolchain RIOT_CI_BUILD=1 \
-        make -C${appdir} clean all test-input-hash -j${JOBS:-4}
+        make -C${appdir} all test-input-hash -j${JOBS:-4}
     RES=$?
 
+    if [ ${NIGHTLY} -eq 1 ]; then
+        no_kconfig_hashes="$(cat ${BINDIR}/test-input-hash.sha1)"
+    fi
+    # test hash is used to cache test results, not for comparing binaries
+    # generated with and without KConfig
     test_hash=$(test_hash_calc "$BINDIR")
 
+
     if [ ${should_check_kconfig_hash} != 0 ]; then
-        if [ ${kconfig_test_hash} != ${test_hash} ]; then
-            echo "Hashes of binaries with and without Kconfig mismatch for ${appdir} with ${board}";
-            echo "Please check that all used modules are modelled in Kconfig and enabled";
+        if [ ${NIGHTLY} -eq 1 ]; then
+            if [ "${kconfig_hashes}" != "${no_kconfig_hashes}" ]; then
+                echo "Hashes of binaries with and without Kconfig mismatch for ${appdir} with ${board}";
+                echo "Please check that all used modules are modelled in Kconfig and enabled";
+                echo "Input without KConfig:"
+                echo "${no_kconfig_hashes}"
+                echo "Input with KConfig:"
+                echo "${kconfig_hashes}"
+                kconfig_module_packages_diff ${board} ${appdir}
+                RES=1
+            fi
+        else
             kconfig_module_packages_diff ${board} ${appdir}
-            RES=1
+            RES=$(( $RES | $? ))
         fi
     fi
 

diff --git a/.murdock.yml b/.murdock.yml
@@ -0,0 +1,22 @@
+push:
+  branches:
+    # these two enable potential bors support:
+    - staging
+    - trying
+
+pr:
+  enable_comments: true
+  sticky_comment: true
+  comment_artifacts:
+  - name: doc-preview/
+    readable_name: Documentation preview
+  comment_footer: >
+    **This only reflects a subset of all builds from https://ci-prod.riot-os.org.
+    Please refer to https://ci.riot-os.org for a complete build for now.**
+
+commit:
+  skip_keywords: ["ci_skip", "murdock_skip"]
+
+artifacts:
+  - output.txt
+  - doc-preview/
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -53,7 +53,6 @@
 /cpu/fe310/                                 @aabadie @kaspar030 @bergzand
 /cpu/kinetis/                               @fjmolinas
 /cpu/lpc2387/                               @benpicco @maribu
-/cpu/mips*/                                 @kaspar030 @francois-berder
 /cpu/msp430*/                               @kaspar030 @gschorcht
 /cpu/nrf*/                                  @aabadie @haukepetersen
 /cpu/nrf52/radio/nrf802154/                 @bergzand @SemjonKerner @jia200x
@@ -108,6 +107,7 @@
 /pkg/openthread/                            @Hyungsin @jia200x
 /pkg/semtech-loramac/                       @aabadie @jia200x
 /pkg/tinydtls/                              @rfuentess @leandrolanzieri
+/pkg/tinyvcdiff/                            @jue89
 /pkg/u8g2/                                  @basilfx
 /pkg/ucglib/                                @basilfx
 /pkg/wakaama/                               @leandrolanzieri