From fbde28a059604f4206ed742e37b2fc0ea3134282 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 13 Sep 2024 10:18:55 -0700 Subject: [PATCH] [github-actions] migrate version 1.3 checks to 1.4 (#2490) * submodule: bump third_party/openthread/repo from `c0690e7` to `dccc519` Bumps [third_party/openthread/repo](https://github.com/openthread/openthread) from `c0690e7` to `dccc519`. - [Release notes](https://github.com/openthread/openthread/releases) - [Commits](https://github.com/openthread/openthread/compare/c0690e78fcb0a780770687a70eac74858efe5d7c...dccc5193afd64cfe1b3488a1ed2107355d5eeabc) --- updated-dependencies: - dependency-name: third_party/openthread/repo dependency-type: direct:production ... Signed-off-by: dependabot[bot] * [github-actions] migrate version 1.3 checks to 1.4 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/border_router.yml | 4 ++-- .github/workflows/ncp_mode.yml | 2 +- script/test | 2 +- tests/scripts/meshcop | 2 +- third_party/openthread/repo | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/border_router.yml b/.github/workflows/border_router.yml index 4b67f2bfdd3..de8a3c6b277 100644 --- a/.github/workflows/border_router.yml +++ b/.github/workflows/border_router.yml @@ -110,7 +110,7 @@ jobs: name: ${{ matrix.name }} env: PACKET_VERIFICATION: ${{ matrix.packet_verification }} - THREAD_VERSION: 1.3 + THREAD_VERSION: 1.4 VIRTUAL_TIME: 0 PYTHONUNBUFFERED: 1 REFERENCE_DEVICE: 1 @@ -177,7 +177,7 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ failure() && steps.check_cache_result.outputs.cache-hit != 'true' }} with: - name: thread-1-3-backbone-results + name: thread-1-4-backbone-results path: | third_party/openthread/repo/ot_testing/*.pcap third_party/openthread/repo/ot_testing/*.json diff --git a/.github/workflows/ncp_mode.yml b/.github/workflows/ncp_mode.yml index d5b1650ec2c..0370311ae6d 100644 --- a/.github/workflows/ncp_mode.yml +++ b/.github/workflows/ncp_mode.yml @@ -60,7 +60,7 @@ jobs: run: tests/scripts/bootstrap.sh - name: Build run: | - OTBR_BUILD_DIR="./build/temp" script/cmake-build -DCMAKE_BUILD_TYPE=Debug -DOT_THREAD_VERSION=1.3 -DOTBR_COVERAGE=ON -DOTBR_DBUS=ON -DOTBR_FEATURE_FLAGS=ON -DOTBR_TELEMETRY_DATA_API=ON -DOTBR_WEB=ON -DOTBR_UNSECURE_JOIN=ON -DOTBR_TREL=ON + OTBR_BUILD_DIR="./build/temp" script/cmake-build -DCMAKE_BUILD_TYPE=Debug -DOT_THREAD_VERSION=1.4 -DOTBR_COVERAGE=ON -DOTBR_DBUS=ON -DOTBR_FEATURE_FLAGS=ON -DOTBR_TELEMETRY_DATA_API=ON -DOTBR_WEB=ON -DOTBR_UNSECURE_JOIN=ON -DOTBR_TREL=ON - name: Run run: OTBR_VERBOSE=1 OTBR_TOP_BUILDDIR="./build/temp" script/test ncp_mode - name: Codecov diff --git a/script/test b/script/test index 31c19c45f4e..ca9398e0452 100755 --- a/script/test +++ b/script/test @@ -128,7 +128,7 @@ do_build() otbr_options=( "-DCMAKE_BUILD_TYPE=${OTBR_BUILD_TYPE}" "-DCMAKE_INSTALL_PREFIX=/usr" - "-DOT_THREAD_VERSION=1.3" + "-DOT_THREAD_VERSION=1.4" "-DOTBR_DBUS=ON" "-DOTBR_FEATURE_FLAGS=ON" "-DOTBR_TELEMETRY_DATA_API=ON" diff --git a/tests/scripts/meshcop b/tests/scripts/meshcop index f44882dd8fe..104c21e7ed1 100755 --- a/tests/scripts/meshcop +++ b/tests/scripts/meshcop @@ -517,7 +517,7 @@ test_meshcop_service() service="$(scan_meshcop_service)" grep "${OT_SERVICE_INSTANCE}._meshcop\._udp" <<<"${service}" grep "rv=1" <<<"${service}" - grep "tv=1\.3\.0" <<<"${service}" + grep "tv=1\.4\.0" <<<"${service}" grep "nn=${network_name}" <<<"${service}" grep "xp=${xpanid_txt}" <<<"${service}" grep "xa=${extaddr_txt}" <<<"${service}" diff --git a/third_party/openthread/repo b/third_party/openthread/repo index c0690e78fcb..dccc5193afd 160000 --- a/third_party/openthread/repo +++ b/third_party/openthread/repo @@ -1 +1 @@ -Subproject commit c0690e78fcb0a780770687a70eac74858efe5d7c +Subproject commit dccc5193afd64cfe1b3488a1ed2107355d5eeabc