fix(coex): fix some coexist bugs 20241104 (a5d64544)

This commit is contained in:
liuning
2024-11-05 11:43:53 +08:00
parent d17141ba29
commit 97df1ca6cb
9 changed files with 16 additions and 9 deletions
+15 -3
View File
@@ -19,21 +19,33 @@ before_script:
- base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- if git ls-remote ${GITLAB_SSH_SERVER}/idf/esp-idf.git | grep -sw ${CI_BUILD_REF_NAME} 2>&1>/dev/null; then IDF_BRANCH=${CI_BUILD_REF_NAME} ; fi
- if [[ "${BOT_CUSTOMIZED_REVISION}" ]] && [[ "$BOT_CUSTOMIZED_REVISION" == *"esp-idf"* ]]; then IDF_BRANCH=$(python -c 'import os;print eval(os.environ["BOT_CUSTOMIZED_REVISION"])["esp-idf"]') ; fi
- echo Cloning esp-idf - ${IDF_BRANCH} ...
- git clone --single-branch -b $IDF_BRANCH --dissociate ${GITLAB_SSH_SERVER}/idf/esp-idf.git
- if [[ -z "$IDF_PATH" ]]; then
echo "Installing esp-idf...";
./esp-idf/install.sh;
source ./esp-idf/export.sh;
else
echo "esp-idf is already installed at $IDF_PATH, skipping install.";
fi
check_lib_reversion:
stage: check
except:
- master
- /^release\/v/
image: $CI_DOCKER_REGISTRY/esp32-ci-env
image: $CI_DOCKER_REGISTRY/esp-env-v5.4:1
script:
- GIT_COMMIT_ID=`git log --pretty="%s" -1 | grep -o '([0-9a-f]*)' | tail -1 | cut -c 2-8`
- echo "GIT_COMMIT_ID is "$GIT_COMMIT_ID
- test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7
- for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done;
- for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2; do grep $GIT_COMMIT_ID-remote $dir/libcoexist.a; done;
- for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | wc -l) -eq 0; done;
- for dir in esp32c3 esp32c2 esp32c6 esp32h2; do test $(riscv-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done;
- for dir in esp32c3 esp32c2 esp32c6 esp32h2; do test $(riscv-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done;
- for dir in esp32c3 esp32c2 esp32c6 esp32h2; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done;
- for dir in esp32c3 esp32c2 esp32c6 esp32h2; do test $(riscv32-esp-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done;
- for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done;
- for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done;
- for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6 esp32h2; do cd $dir; for filename in *; do if [[ -x "$file" ]]; then echo "Execute permissions for $dir/$filename"; exit 1; fi; done; cd .. ; done
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -6
View File
@@ -1,6 +1,6 @@
build_ssc_esp32:
stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env
image: $CI_DOCKER_REGISTRY/esp-env-v5.4:1
tags:
- wlan_feature
@@ -17,11 +17,6 @@ build_ssc_esp32:
- rm -rf /tmp/esp_coex_lib
- mkdir /tmp/esp_coex_lib
- cp -rf * /tmp/esp_coex_lib
- if git ls-remote ${GITLAB_SSH_SERVER}/idf/esp-idf.git | grep -sw ${CI_BUILD_REF_NAME} 2>&1>/dev/null; then IDF_BRANCH=${CI_BUILD_REF_NAME} ; fi
- if [[ "${BOT_CUSTOMIZED_REVISION}" ]] && [[ "$BOT_CUSTOMIZED_REVISION" == *"esp-idf"* ]]; then IDF_BRANCH=$(python -c 'import os;print eval(os.environ["BOT_CUSTOMIZED_REVISION"])["esp-idf"]') ; fi
- echo Cloning esp-idf - ${IDF_BRANCH} ...
- git clone --recursive --single-branch -b $IDF_BRANCH --dissociate ${GITLAB_SSH_SERVER}/idf/esp-idf.git
- cd esp-idf
- coex_lib_path=`grep -B 1 esp-coex-lib .gitmodules | grep path | cut -d' ' -f3`
- cd $CI_PROJECT_DIR
- rm -rf esp-idf/$coex_lib_path/*