From 3319009f70f893b108e2dcf53205e34f1947ab4e Mon Sep 17 00:00:00 2001 From: Song GUO Date: Mon, 20 Dec 2021 22:13:28 +0800 Subject: [PATCH] [hotfix] Change LwIP upstream in p6_sdk to a temporary mirror URL, fix cirque bootstrap failure (#13154) * [hotfix] Change lwip upstream in p6_sdk to a temporary URL * [hotfix] Remove duplicate pigweed activate call in cirque --- .gitmodules | 2 +- scripts/tests/cirque_tests.sh | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index 85e0f84d9a05ce..e90a9c72373ae2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -161,4 +161,4 @@ branch = stable [submodule "p6/lwip"] path = third_party/p6/p6_sdk/libs/lwip - url = https://git.savannah.nongnu.org/git/lwip + url = https://github.com/lwip-tcpip/lwip.git diff --git a/scripts/tests/cirque_tests.sh b/scripts/tests/cirque_tests.sh index edde10bc999b8e..ff6996c4aa3094 100755 --- a/scripts/tests/cirque_tests.sh +++ b/scripts/tests/cirque_tests.sh @@ -104,18 +104,6 @@ function cirquetest_bootstrap() { __cirquetest_build_ot_lazy pip3 install -r requirements_nogrpc.txt - - if [[ "x$GITHUB_ACTION_RUN" = "x1" ]]; then - # We may run Cirque tests locally, in that case, we will run - # CHIP bootstrap script elsewhere. Don't run bootstrap so we - # won't break local environment. - set +x - - # Call activate here so the later tests can be faster - # set -e will cause error if activate.sh is sourced twice - # this is an expected behavior caused by pigweed/activate.sh - source "$REPO_DIR/scripts/bootstrap.sh" - fi } function cirquetest_run_test() {