diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ff0cb6..b2e5fd4 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index 455476a..02ac695 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a index 1393d64..ad12c8e 100644 Binary files a/esp32c2/libcoexist.a and b/esp32c2/libcoexist.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 66434cc..d7f88d7 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a index 9219011..b3a796b 100644 Binary files a/esp32c6/libcoexist.a and b/esp32c6/libcoexist.a differ diff --git a/esp32h2/libcoexist.a b/esp32h2/libcoexist.a index 97db030..a1f2b9e 100644 Binary files a/esp32h2/libcoexist.a and b/esp32h2/libcoexist.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index acdfda7..ef4a3ad 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 2d0f3d6..2012cec 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 0ba49f8..80fcab7 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -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/*