diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 955660f..a3f078e 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,40 +32,10 @@ check_lib_reversion: - test $(echo -n $GIT_COMMIT_ID | wc -c) -eq 7 - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6; do grep $GIT_COMMIT_ID $dir/libcoexist.a; done; - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6; do test $(grep $GIT_COMMIT_ID-dirty $dir/*.a | 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; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3 esp32c3 esp32c2 esp32c6; 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; do cd $dir; for filename in *; do if [[ -x "$file" ]]; then echo "Execute permissions for $dir/$filename"; exit 1; fi; done; cd .. ; done -push_master_to_github: - stage: deploy - tags: - - github_sync - only: - - master - - /^release\/v/ -# when: on_success - image: $CI_DOCKER_REGISTRY/esp32-ci-env - variables: - GIT_STRATEGY: clone - GITHUB_PUSH_REFS: refs/remotes/origin/release refs/remotes/origin/master - before_script: [] - script: - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - echo -n $GH_PUSH_KEY > ~/.ssh/id_rsa_base64 - - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa - - chmod 600 ~/.ssh/id_rsa - - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config - - git remote add github git@github.com:espressif/esp-coex-lib.git - # What the next line of script does: goes through the list of refs for all branches we push to github, - # generates a snippet of shell which is evaluated. The snippet checks CI_BUILD_REF against the SHA - # (aka objectname) at tip of each branch, and if any SHAs match then it checks out the local branch - # and then pushes that ref to a corresponding github branch - # - # NB: In gitlab 9.x, CI_BUILD_REF was deprecated. New name is CI_COMMIT_REF. If below command suddenly - # generates bash syntax errors, this is probably why. - - eval $(git for-each-ref --shell bash --format 'if [ $CI_BUILD_REF == %(objectname) ]; then git checkout -B %(refname:strip=3); git push --follow-tags github %(refname:strip=3); fi;' $GITHUB_PUSH_REFS) - include: - 'tools/ci/config/build.yml' - 'tools/ci/config/feature_test.yml' diff --git a/README.md b/README.md index 5bf368e..dd34f3b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ ESP32 Coexist Libraries ==================== -This repository contains binary libraries supporting the ESP32 series coexistence subsystems. It is used as a submodule within `Espressif IoT Development Framework`_ (ESP-IDF). +This repository contains binary libraries supporting the ESP32 series Wi-Fi/Bluetooth/802.15.4 coexistence subsystems. It is used as a submodule within [Espressif IoT Development Framework](https://github.com/espressif/esp-idf). -Files in this repository are Copyright (C) 2015-2016 Espressif Systems. +Files in this repository are Copyright (C) 2015-2023 Espressif Systems. These binary libraries are provided under the same license as the parent esp-idf project - the Apache License 2.0 as provided in the file LICENSE. (The license text refers to this as "Object" form.) - -.. _Espressif IoT Development Framework: https://github.com/espressif/esp-idf diff --git a/esp32/libcoexist.a b/esp32/libcoexist.a index 113b145..50f09d0 100644 Binary files a/esp32/libcoexist.a and b/esp32/libcoexist.a differ diff --git a/esp32c2/libcoexist.a b/esp32c2/libcoexist.a index 6420f48..54c75a8 100644 Binary files a/esp32c2/libcoexist.a and b/esp32c2/libcoexist.a differ diff --git a/esp32c3/libcoexist.a b/esp32c3/libcoexist.a index 1f9a01a..a059707 100644 Binary files a/esp32c3/libcoexist.a and b/esp32c3/libcoexist.a differ diff --git a/esp32c6/libcoexist.a b/esp32c6/libcoexist.a index ba01b83..e851e36 100644 Binary files a/esp32c6/libcoexist.a and b/esp32c6/libcoexist.a differ diff --git a/esp32s2/libcoexist.a b/esp32s2/libcoexist.a index 16d2454..1f81d1a 100644 Binary files a/esp32s2/libcoexist.a and b/esp32s2/libcoexist.a differ diff --git a/esp32s3/libcoexist.a b/esp32s3/libcoexist.a index 477e88c..0b9a774 100644 Binary files a/esp32s3/libcoexist.a and b/esp32s3/libcoexist.a differ diff --git a/tools/ci/build_app.sh b/tools/ci/build_app.sh index 7793f63..bb850e4 100644 --- a/tools/ci/build_app.sh +++ b/tools/ci/build_app.sh @@ -2,19 +2,18 @@ # This file is sourced in to the CI environment # in .gitlab-ci.yml file -set -x +set -euo pipefail die() { echo "${1:-"Unknown Error"}" 1>&2 - exit 1 } [ -z ${IDF_PATH} ] && die "IDF_PATH is not set." # Set Env cd ${CI_PROJECT_DIR}/esp-idf -./install.sh || { echo "Install Failure"; exit 1; } -. ./export.sh || { echo "Export Failure"; exit 1; } +./install.sh || { echo "Install Failure"; } +. ./export.sh || { echo "Export Failure"; } # Set Env cd ${CI_PROJECT_DIR}/SSC @@ -35,10 +34,10 @@ rm -rf ${board}-${CI_PIPELINE_ID}.debug mkdir -p ${board}-${CI_PIPELINE_ID}.debug/ echo Creating ${board}-${VERSION} app binaries debug directory... -cp ${CI_PROJECT_DIR}/SSC/build/ssc.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; exit 1; } -cp ${CI_PROJECT_DIR}/SSC/build/ssc.elf $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; exit 1; } -cp ${CI_PROJECT_DIR}/SSC/build/bootloader/bootloader.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; exit 1; } -cp ${CI_PROJECT_DIR}/SSC/build/partition_table/partition-table.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; exit 1; } +cp ${CI_PROJECT_DIR}/SSC/build/ssc.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; } +cp ${CI_PROJECT_DIR}/SSC/build/ssc.elf $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; } +cp ${CI_PROJECT_DIR}/SSC/build/bootloader/bootloader.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; } +cp ${CI_PROJECT_DIR}/SSC/build/partition_table/partition-table.bin $board-${CI_PIPELINE_ID}.debug/ || { echo "Copy file Status: Failure"; } # Creating tar file (debug) -tar -zcvf $board-${CI_PIPELINE_ID}.debug.tar.gz $board-${CI_PIPELINE_ID}.debug || { echo "Create tar Status: Failure"; exit 1; } +tar -zcvf $board-${CI_PIPELINE_ID}.debug.tar.gz $board-${CI_PIPELINE_ID}.debug || { echo "Create tar Status: Failure"; }