From faa349b93f079daafc7a8e83d283a511e0e62fb0 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 29 Jun 2022 20:23:07 +0200 Subject: [PATCH] global: remove tinyxml2 submodule --- .flake8 | 1 - .gitlab/ci/rules.yml | 1 - .gitmodules | 4 ---- examples/build_system/cmake/import_lib/main/lib/tinyxml2 | 1 - tools/ci/check_build_warnings.py | 1 - tools/ci/static-analysis-rules.yml | 1 - 6 files changed, 9 deletions(-) delete mode 160000 examples/build_system/cmake/import_lib/main/lib/tinyxml2 diff --git a/.flake8 b/.flake8 index 1e235f901c..0a4be0a0f7 100644 --- a/.flake8 +++ b/.flake8 @@ -149,7 +149,6 @@ exclude = components/tinyusb, components/unity/unity, components/spiffs/spiffs, - examples/build_system/cmake/import_lib/main/lib/tinyxml2, examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib, # autogenerated scripts components/protocomm/python/constants_pb2.py, diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 063f53d0ff..377158ba9e 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -193,7 +193,6 @@ - "components/spiffs/spiffs" - "components/tinyusb/tinyusb" - "components/unity/unity" - - "examples/build_system/cmake/import_lib/main/lib/tinyxml2" - "examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib" .patterns-example_test-related_changes-ota: &patterns-example_test-related_changes-ota diff --git a/.gitmodules b/.gitmodules index 4954f2144a..8be23b0f12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,10 +39,6 @@ path = components/unity/unity url = ../../ThrowTheSwitch/Unity.git -[submodule "examples/build_system/cmake/import_lib/main/lib/tinyxml2"] - path = examples/build_system/cmake/import_lib/main/lib/tinyxml2 - url = ../../leethomason/tinyxml2.git - [submodule "components/bt/host/nimble/nimble"] path = components/bt/host/nimble/nimble url = ../../espressif/esp-nimble.git diff --git a/examples/build_system/cmake/import_lib/main/lib/tinyxml2 b/examples/build_system/cmake/import_lib/main/lib/tinyxml2 deleted file mode 160000 index 7e8e249990..0000000000 --- a/examples/build_system/cmake/import_lib/main/lib/tinyxml2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e8e249990ec491ec15990cf95b6d871a66cf64a diff --git a/tools/ci/check_build_warnings.py b/tools/ci/check_build_warnings.py index f40a196760..7e6eafd3fa 100755 --- a/tools/ci/check_build_warnings.py +++ b/tools/ci/check_build_warnings.py @@ -39,7 +39,6 @@ IGNORE_WARNS = [ r'crosstool_version_check\.cmake', r'CryptographyDeprecationWarning', r'Warning: \d+/\d+ app partitions are too small for binary', - r'CMake Deprecation Warning at main/lib/tinyxml2/CMakeLists\.txt:11 \(cmake_policy\)', ] ] diff --git a/tools/ci/static-analysis-rules.yml b/tools/ci/static-analysis-rules.yml index afa6fffb95..a9cc044957 100644 --- a/tools/ci/static-analysis-rules.yml +++ b/tools/ci/static-analysis-rules.yml @@ -29,7 +29,6 @@ skip: - "components/spiffs/spiffs" - "components/tinyusb/tinyusb" - "components/unity/unity" - - "examples/build_system/cmake/import_lib/main/lib/tinyxml2" - "examples/peripherals/secure_element/atecc608_ecdsa/components/esp-cryptoauthlib" # disabled temporarily to pass the CI