Commit Graph

1132 Commits

Author SHA1 Message Date
Martin Gaňo
252036567c Moved filters out of idf_monitor.py 2021-06-17 21:38:38 +02:00
Angus Gratton
059353b0c2 Merge branch 'feature/refactor_common_secure_boot_code' into 'master'
secure_boot/flash_encryption: Refactoring

Closes IDF-2582 and IDF-2035

See merge request espressif/esp-idf!12963
2021-06-16 23:21:45 +00:00
Konstantin Kondrashov
f339b3fc96 efuse(esp32): Deprecate esp_efuse_burn_new_values() & esp_efuse_write_random_key()
These functions were used only for esp32 in secure_boot and flash encryption.
Use idf efuse APIs instead of efuse regs.
2021-06-17 07:21:36 +08:00
Marius Vikhammer
d9f5126d24 CI: enable running unit tests in CI for S3 2021-06-15 11:13:50 +08:00
Anton Maklakov
6d9740bc5d Merge branch 'ci/retry_downlad_for_artifacts' into 'master'
ci: retry download artifacts

See merge request espressif/esp-idf!13517
2021-06-11 09:46:29 +00:00
Angus Gratton
bc4eb2071c Merge branch 'feature/toolchain_2021r1' into 'master'
Bring 2021r1 toolchains

Closes IDFGH-5009

See merge request espressif/esp-idf!13554
2021-06-09 05:06:23 +00:00
Marius Vikhammer
bdfda351bd build docs: enable building of S3 docs
* Added suport for building esp32s3 docs
 * Fixed all related warnings
 * Activated building of S3 docs for build HTML fast CI job
2021-06-09 09:30:36 +08:00
Fu Hanxi
a624d3bf32 ci: retry download artifacts 2021-06-08 15:04:06 +08:00
Anton Maklakov
0ed7af2c4c tools: promote ESP32-S3 from preview to supported target 2021-06-07 12:52:28 +07:00
Shu Chen
6061a547e5 esp_phy: decouple esp_phy component from esp_wifi and bt
* add esp-phy-lib submodule
* move libphy.a and phy_init.c from esp_wifi to esp_phy
* move librtc.a from esp_wifi to esp_phy
* move libbtbb.a from bt to esp_phy
* corresponding updates to build system
2021-06-03 16:17:31 +08:00
Anton Maklakov
37b058dfcf Merge branch 'tools/update_mypy_rules' into 'master'
Change logic for MYPY checker

See merge request espressif/esp-idf!13509
2021-06-02 10:16:05 +00:00
Shivani Tipnis
2d22374460 ble-wifi-example-tests: Add fixes and cleanups to ble and wifi tests 2021-05-28 19:50:28 +05:30
He Yin Ling
201018da43 Merge branch 'ci/shorter_performance_test_log' into 'master'
ci: optimize performance test log

See merge request espressif/esp-idf!13607
2021-05-21 06:48:16 +00:00
He Yin Ling
79cd45fdee Merge branch 'test/support_multiple_targets_for_iperf_example_test' into 'master'
test: support multiple targets for iperf example test

Closes TCI-656

See merge request espressif/esp-idf!13527
2021-05-21 06:43:21 +00:00
He Yin Ling
016a37c8ad ci: save built binaries could be tested locally:
we have some test cases not executed in CI. we need to save those
binaries as artifacts so we can test locally.
2021-05-20 16:58:39 +08:00
He Yin Ling
8434c0c731 ttfw: fix DUT exception not added to junit report 2021-05-20 16:28:20 +08:00
Fu Hanxi
bccaab7e6c fix(ci): fix missing [Performance] prefix in junit report 2021-05-20 14:13:54 +08:00
Fu Hanxi
4304866780 ci: shorter performance test log 2021-05-20 14:13:54 +08:00
Angus Gratton
0fc9253ed9 lwip: Update public port-layer headers with c++ guards, sdkconfig include
This doesn't fix any particular bug, just to meet best practices. Although
including some LWIP headers from C++ files may have caused linker issues.
2021-05-18 16:09:17 +10:00
Tomas Sebestik
396acc5b31 Change logic for MYPY checker 2021-05-11 08:45:14 +02:00
Ivan Grokhotkov
1fb58684a2 unity: add UNITY_MAIN_FUNC helper macro to run multiple test groups 2021-05-10 18:13:35 +02:00
Angus Gratton
84f2f2932d Merge branch 'bugfix/esp_partition_get_sha256' into 'master'
bootloader_support: Fix bootloader_common_get_sha256_of_partition when CHECK_SIGNATURE is on

Closes IDFGH-5089

See merge request espressif/esp-idf!12795
2021-05-07 23:34:56 +00:00
Ivan Grokhotkov
acd06daf39 Merge branch 'bugfix/spiram_h_header_guards' into 'master'
add missing header guards to {esp32,esp32s3}/spiram.h (Github PR)

Closes IDFGH-4861

See merge request espressif/esp-idf!13435
2021-05-06 11:49:39 +00:00
Ivan Grokhotkov
d7f219686f Merge branch 'feature/spiffsgen_py_esp8266_compat' into 'master'
spiffsgen.py: esp8266 compatibility options, performance improvement, type annotations

Closes IDFGH-4925

See merge request espressif/esp-idf!12839
2021-05-05 15:04:19 +00:00
KonstantinKondrashov
2e4b625f59 simple_ota_example: Adds sha256 check for app images 2021-05-05 22:18:40 +08:00
Ivan Grokhotkov
2887c88f56 spiram: add header guards to esp32s3/spiram.h and remove the exception 2021-05-05 15:27:19 +02:00
Ivan Grokhotkov
0bd9f6fe12 tools: spiffsgen: fix length error, add test case 2021-05-03 11:37:42 +02:00
Ivan Grokhotkov
c88287851d Merge branch 'feature/raise_log_level' into 'master'
feature: Set maximum log level, add startup time example

Closes IDFGH-3599 and IDFGH-333

See merge request espressif/esp-idf!12714
2021-05-03 08:52:27 +00:00
Ivan Grokhotkov
9f20eeb1c0 tools: spiffsgen.py: add type annotations 2021-04-30 18:07:48 +02:00
Krzysztof Budzynski
f05d9a1de0 Merge branch 'bugfix/check_readme_links_no_exception' into 'master'
check_readme_links: remove throwing of exception before exit

See merge request espressif/esp-idf!13341
2021-04-30 03:50:10 +00:00
Ivan Grokhotkov
f86a6db1f2 Merge branch 'feature/espcoredump_py_riscv_support' into 'master'
feature: espcoredump py riscv support

Closes IDF-2638 and IDF-2715

See merge request espressif/esp-idf!12259
2021-04-27 09:26:52 +00:00
Fu Hanxi
cba0725aac Merge branch 'bugfix/ci_check_executable_windows' into 'master'
ci: fix check_executables issue on Windows

See merge request espressif/esp-idf!13342
2021-04-27 07:14:59 +00:00
Fu Hanxi
b972631658 feat(coredump): add esp32s2 and esp32c3 support 2021-04-26 20:44:23 +08:00
Michael (XIAO Xufeng)
9aebd01aeb ci: fix check_executables issue on Windows 2021-04-26 15:55:31 +08:00
Marius Vikhammer
4bf7b16358 check_readme_links: remove throwing of exception before exit
Reraising the exception before exiting was intended to help troubleshoot,
but turned out to be more confusing than helpful as it might look like the script was failing
2021-04-26 15:36:30 +08:00
Cao Sen Miao
2059990c94 ci: Add more information for flash performance test 2021-04-25 17:59:10 +08:00
Michael (XIAO Xufeng)
0adc6fa17d Merge branch 'example/i2s_sound_record' into 'master'
Added I2S example for microphone recording to WAV file and I2S examples folder moved

See merge request espressif/esp-idf!12835
2021-04-24 10:41:26 +00:00
pedro.minatel
86fa666343 Added I2S example for microphone recording to WAV file and I2S examples folder moved
Added import module check on generate_audio_file.py and removed from mypy ignore list
Added sugestions and minor changes on the README
2021-04-23 15:06:26 +01:00
Angus Gratton
cdef1ea38a examples: Add example for fastest startup time
Example includes README and sdkconfig.defaults with notes about trade-offs
made for minimum boot time.
2021-04-23 18:27:20 +10:00
Jakob Hasse
fc22e3c645 [system]: Made longjmp save for context switch
* Patched longjmp to be context-switch safe
  longjmp modifies the windowbase and windowstart
  registers, which isn't safe if a context switch
  occurs during the modification. After a context
  switch, windowstart and windowbase will be
  different, leading to a wrongly set windowstart
  bit due to longjmp writing it based on the
  windowbase before the context switch. This
  corrupts the registers at the next window
  overflow reaching that wrongly set bit.

  The solution is to disable interrupts during
  this code. It is only 6 instructions long,
  the impact shouldn't be significant.

  The fix is implemented as a wrapper which
  replaces the original first instructions of
  longjmp which are buggy. Then, it jumps back
  to execute the rest of the original longjmp
  function.

  Added a comparably reliable test to the
  test apps.
2021-04-23 15:55:31 +08:00
suren.gabrielyan
823abfdfd5 examples: Add esp-ssl example tests server/client
Closes IDF-1156
2021-04-21 16:18:03 +04:00
Shu Chen
f8addc5b3d Merge branch 'bugfix/add-ci-allow-line' into 'master'
tools: Add /*error*.o and /*error*.d to allowed build lines

See merge request espressif/esp-idf!13251
2021-04-20 12:05:27 +00:00
Fu Hanxi
af2139e0b6 Merge branch 'bugfix/ci/runner_py_consider_no_junit_report_as_succeeded' into 'master'
CI: runner py consider no test case as succeeded

See merge request espressif/esp-idf!13098
2021-04-20 10:13:02 +00:00
Jiacheng Guo
9c9838f229 tools: Add /*error*.o and /*error*.d to allowed build lines 2021-04-20 18:09:40 +08:00
Shu Chen
809832f3bc Merge branch 'bugfix/add-ci-allow-file-filter' into 'master'
tools: Add *error*.cpp to allowed build lines

See merge request espressif/esp-idf!13176
2021-04-20 03:25:58 +00:00
Fu Hanxi
9b8d1e7826 fix(ci): return as failed when no test case result generated 2021-04-20 11:18:12 +08:00
Fu Hanxi
15b6389ca7 fix(ci): ci_fetch_submodule return full match name first 2021-04-19 19:34:11 +08:00
Jiacheng Guo
4253d9ee49 tools: Add *error*.cpp to allowed build lines 2021-04-19 10:19:59 +08:00
Angus Gratton
bed8b29d9a ci: Move partition table offset for -O0 build of template app 2021-04-16 16:40:47 +10:00
Angus Gratton
6f6b4c3983 cmake partition_table: Check binaries fit in partition spaces at build time
- Bootloader is checked not to overlap partition table
- Apps are checked not to overlap any app partition regions

Supported for CMake build system only.

Closes https://github.com/espressif/esp-idf/pull/612
Closes https://github.com/espressif/esp-idf/issues/5043
Probable fix for https://github.com/espressif/esp-idf/issues/5456
2021-04-16 16:40:47 +10:00
He Yin Ling
d1ab7fbd5a Merge branch 'bugfix/ttfw_idf_port_detecting_hang' into 'master'
fix: running ttfw tests locally hang forever while detecting ports

See merge request espressif/esp-idf!13048
2021-04-15 02:27:36 +00:00
Ivan Grokhotkov
e220e9b571 Merge branch 'feature/refactor-idf-monitor' into 'master'
Decompose idf_monitor.py

Closes IDF-2432

See merge request espressif/esp-idf!11815
2021-04-14 14:32:17 +00:00
Angus Gratton
16d5277bd5 Merge branch 'ci/include_failed_build_output_in_log' into 'master'
CI: Include failed build output in job log

Closes IDF-2220

See merge request espressif/esp-idf!12399
2021-04-14 08:34:26 +00:00
Fu Hanxi
7651e031cb fix: running ttfw tests locally hang forever while detecting ports 2021-04-14 11:43:13 +08:00
Martin Gano
1546e970db Merge branch 'master' into 'feature/refactor-idf-monitor'
# Conflicts:
#   tools/ci/mypy_ignore_list.txt
2021-04-13 20:55:19 +08:00
Tomas Sebestik
e408915ff0 Remove sorting of MYPY ignore list from py script
Add sorting of mypy ignore list to pre-cm hook 'file-contents-sorter'
2021-04-13 10:35:56 +02:00
Martin Gaňo
b77addea2f Decompose idf_monitor.py 2021-04-12 10:47:33 +02:00
Angus Gratton
2a33dbb5a7 ci: Include context from failed build logs in the CI job log
This is faster to look up than browsing or downloading artifacts, and will often
contain the root cause.

Context includes the last 25 lines of the log, and any lines contaiing 'error:'
or 'warning:'
2021-04-12 05:48:40 +00:00
Angus Gratton
509afa839e Merge branch 'feature/google_analytics' into 'master'
docs: add google analytics tracking

Closes IDF-1481 and DOC-204

See merge request espressif/esp-idf!13025
2021-04-07 06:07:27 +00:00
Marius Vikhammer
440fab3d6e docs: add google analytics tracking 2021-04-06 11:56:11 +08:00
Angus Gratton
6b57f33858 Merge branch 'refactor/movements_from_target_components' into 'master'
Movement from target components 1

See merge request espressif/esp-idf!12482
2021-04-05 02:37:21 +00:00
Chen Shu
6be0ed9077 Merge branch 'feature/add-openthread' into 'master'
openthread: add OpenThread and porting

Closes IDF-2911

See merge request espressif/esp-idf!12570
2021-04-02 06:49:55 +00:00
Guo Jia Cheng
7c38989309 OpenThread: add OpenThread and porting
* Adds the OpenThread submodule.
* Adds porting on ESP32.
* Adds the OpenThread cli example.
2021-04-02 14:49:49 +08:00
Fu Hanxi
92a9ad0b31 ci: allow wildcard in known failure cases 2021-04-01 19:29:04 +08:00
Angus Gratton
da3dca1fdc Merge branch 'bugfix/change_component_ordering' into 'master'
cmake: swap priority between EXTRA_COMPONENT_DIRS and project components

Closes IDF-2864

See merge request espressif/esp-idf!12765
2021-04-01 07:23:00 +00:00
Renz Bagaporo
bbc599493e esp32: move common fragment definitions 2021-03-31 19:17:33 +08:00
Ivan Grokhotkov
fa995fd92f Merge branch 'bugfix/broken_virtualenv' into 'master'
tools: Reinstall virtualenv if it is broken

Closes IDFGH-4859

See merge request espressif/esp-idf!12626
2021-03-29 08:44:17 +00:00
Renz Bagaporo
b5c3d4f615 cmake: swap priority between EXTRA_COMPONENT_DIRS and project components 2021-03-22 19:01:33 +08:00
Omar Chebib
5371231935 build: fix linker scripts edition not triggering a rebuild
Fix the dependencies in CMakeLists files for triggering a relink
when linker script file is modified.
2021-03-12 07:48:32 +00:00
Roland Dobai
da8e3e5607 CI: Fix git tag in cmake build tests where email address cannot be autodetected 2021-03-11 17:18:26 +00:00
Roland Dobai
191c4ccc01 tools: Add Python typing annotations for idf_tools.py 2021-03-08 10:20:33 +01:00
Roland Dobai
464b3d814e CI: Use temporary git configs in the tests 2021-03-05 11:54:11 +01:00
Fu Hanxi
8ce9e17718 Merge branch 'ci/remove_commit_trigger_and_wip_restriction' into 'master'
CI: remove commit trigger and wip restriction

See merge request espressif/esp-idf!12580
2021-03-05 02:27:03 +00:00
Angus Gratton
9ae01e40b5 ci: Add a test app for not placing embedded file paths into binaries
Doubles as a test app that building with assertions off doesn't produce warnings.

Closes https://github.com/espressif/esp-idf/issues/6306
2021-03-03 10:31:05 +11:00
Fu Hanxi
c7a856db88 ci: remove trigger with commit message method and make it simpler 2021-03-02 11:50:04 +08:00
Tomas Sebestik
c9f710ea2c Update mypy_ignore_list
Add missing records mostly in /examples dir
2021-03-01 07:41:37 +01:00
Anton Maklakov
3a629afb06 Merge branch 'feature/type_checking_python' into 'master'
CI:Type checking of Python scripts

Closes IDF-2413

See merge request espressif/esp-idf!12287
2021-02-26 03:06:37 +00:00
Angus Gratton
501af6dfa2 Merge branch 'feature/secure_boot_revoke_check' into 'master'
secure_boot: Checks secure boot efuses

Closes IDF-2609

See merge request espressif/esp-idf!12148
2021-02-25 22:38:42 +00:00
Angus Gratton
0f62d0dd9b Merge branch 'bugfix/git_describe' into 'master'
tools: Use git describe --match for filtering out internal names

Closes IDF-2410

See merge request espressif/esp-idf!12398
2021-02-25 07:23:38 +00:00
Tomas Sebestik
cc33aafc4f Update exclude_check_tools_files.txt
Add tools/ci/mypy_ignore_list.txt to exclude_check_tools_files.txt
2021-02-25 07:05:43 +00:00
Tomas Sebestik
a22597a2d6 Add mypy check to pre-commit-config 2021-02-25 07:05:43 +00:00
Renz Bagaporo
813044c6db docs, ci: update docs and ci with movements from esp_common 2021-02-24 12:16:37 +08:00
Angus Gratton
c179ece204 Merge branch 'bugfix/c++_usage_esp_core_dump_h' into 'master'
Fixed c++ include usage for esp_core_dump.h

Closes IDFGH-4782

See merge request espressif/esp-idf!12432
2021-02-24 03:18:25 +00:00
Roland Dobai
48488f1683 tools: Use git describe --match for filtering out internal names 2021-02-23 06:55:21 +00:00
KonstantinKondrashov
90f2d3199a secure_boot: Checks secure boot efuses
ESP32 V1 and V2 - protection bits.
ESP32xx V2: revoke bits, protection bits

- refactor efuse component
- adds some APIs for esp32 chips as well as for esp32xx chips
2021-02-23 03:56:21 +08:00
morris
018d13645b ci: exclude esp_rom component when checking rom api usage 2021-02-22 20:56:43 +08:00
0xFEEDC0DE64
e5c460ec7d Removed esp_core_dump.h from check_public_headers_exceptions.txt (as per @igrr 's request 2021-02-21 01:35:42 +01:00
Ivan Grokhotkov
22cc1121fb Merge branch 'ci/detect_file_changes_to_assign_jobs' into 'master'
CI: Detect file changes to assign jobs

See merge request espressif/esp-idf!10652
2021-02-16 11:08:17 +00:00
Roland Dobai
47f67f8b81 tools: Prefer python3 during install and export
Install and export script should work on systems without "python"
executable.

Closes https://github.com/espressif/esp-idf/pull/6471

Closes https://github.com/espressif/esp-idf/issues/6532

Related to https://github.com/espressif/esp-idf/issues/6421 and
https://github.com/espressif/arduino-esp32/issues/4717
2021-02-13 11:34:40 +01:00
Angus Gratton
e22de81955 Merge branch 'feature/idfpy_update_component_manager_tests' into 'master'
CMake - process dependencies for all components by component manager

Closes PACMAN-87

See merge request espressif/esp-idf!9357
2021-02-12 11:28:18 +08:00
Fu Hanxi
7db83b26da style(pre-commit): unrelated changes 2021-02-10 14:50:07 +08:00
Fu Hanxi
80e86e7939 ci(pre-commit): check if rules is updated and valid 2021-02-10 14:50:07 +08:00
Fu Hanxi
b24b06d16c ci(rules): auto generate rules.yml labels titles and rules
Also simplified the labels and ci

- Remove label regular_test, weekend_test

- Remove apply_job_filter

- check_submodule_sync: only run on protected branch
2021-02-10 14:50:06 +08:00
Fu Hanxi
8ff6461b4c ci(rules): add check_tools_file_patterns.py
this file is used to check if all files under `tools` folder are
recorded in patterns or in exclude list
2021-02-10 14:48:51 +08:00
Fu Hanxi
b33e344484 ci: move config dir to .gitlab/ci 2021-02-10 14:48:51 +08:00
Fu Hanxi
7735d04f4f ci(sonarqube): Modify code_quality_check since it's a MR pipeline now 2021-02-10 14:48:51 +08:00
Fu Hanxi
ffe0b7af32 ci: Move static code analysis related jobs to static-code-analysis.yml 2021-02-10 14:48:51 +08:00
Fu Hanxi
7dd7c6c072 ci(docs): Move doc related jobs to docs.yml 2021-02-10 14:48:51 +08:00
Anton Maklakov
0bbc721a63 Merge branch 'bugfix/known_failure_cases_read_file_error' into 'master'
ci: bugfix: known failure cases cannot read files

See merge request espressif/esp-idf!12340
2021-02-10 12:27:23 +08:00
Fu Hanxi
4ffd458ddd ci: bugfix: known failure cases cannot read files 2021-02-09 15:33:49 +08:00
Marius Vikhammer
04df1f3a42 CI: enable example builds for C3
Enables building C3 examples in CI.

Fixes related warnings/errors and disables examples that cannot run.
2021-02-09 12:04:02 +08:00
Angus Gratton
1289918204 Merge branch 'refactor/ldgen_generation_changes' into 'master'
ldgen: internal data structure change

See merge request espressif/esp-idf!11494
2021-02-09 11:03:09 +08:00
Michael (XIAO Xufeng)
747ac00f9b Merge branch 'bugfix/flash_encyption_80Mflash_40Mram' into 'master'
flash_encryption/psram: fixed the issue that block when flash_encryption_write

See merge request espressif/esp-idf!12177
2021-02-05 22:00:26 +08:00
Cao Sen Miao
c1b41ece32 flash_encryption: Quick fixed the issue that block when flash_encryption_write, Related https://github.com/espressif/esp-idf/issues/6322, Related https://github.com/espressif/esp-idf/issues/6254 2021-02-05 20:10:42 +08:00
Michael (XIAO Xufeng)
423a5458dc Merge branch 'bugfix/support_new_BYflash_chip_boot' into 'master'
spi_flash: add external flash support on esp32c3

Closes IDF-2650, IDF-2651, and IDF-2399

See merge request espressif/esp-idf!12121
2021-02-05 20:03:24 +08:00
Michael (XIAO Xufeng)
fb678dd772 ci: increase target test job num 2021-02-05 15:03:16 +08:00
Cao Sen Miao
8020c46da7 spi_flash: enable ext flash unit-test on esp32c3 2021-02-04 14:44:50 +08:00
Renz Bagaporo
0142676cbf ldgen: additional tests for generation support classes 2021-02-03 19:50:36 +08:00
morris
e361498a2a intr_alloc: re-enable unit test 2021-02-02 20:25:50 +08:00
Marius Vikhammer
548fd02d10 docs: initial update of programming guide for C3
Updates "front page" content, get-started, and api-guides with C3 content

Enable building and publishing of C3 docs in CI
2021-02-01 15:40:02 +08:00
Sergei Silnov
99bf2ed61d idf.py: remove mentions of idf_project.yml and update tests 2021-01-29 23:08:47 +01:00
Ivan Grokhotkov
9a20283485 Merge branch 'bugfix/scan_test_missing_build_apps_without_tests' into 'master'
ci: bugfix: scan_test missing build apps without tests

See merge request espressif/esp-idf!12138
2021-01-28 17:48:24 +08:00
Fu Hanxi
85d4bca81a feat(tiny_test_fw): unify all junit report test case name
new format: <target>.<config>.<case_name>, the default value of
"config" is "default"
2021-01-28 12:25:14 +08:00
Fu Hanxi
7518393ee8 feat(ci): update known_failure_cases_repo before running tests 2021-01-28 12:25:14 +08:00
Fu Hanxi
d63069068f feat(tiny_test_fw): ignore known failure cases result
py
2021-01-28 12:25:14 +08:00
Fu Hanxi
be3d74efb2 fix(ci): scan_test missing build apps without tests 2021-01-27 12:35:49 +08:00
Fu Hanxi
0146f258d7 style: format python files with isort and double-quote-string-fixer 2021-01-26 10:49:01 +08:00
Cao Sen Miao
f3e79ca166 spi_flash(c3): add boya chip support for suspend feature 2021-01-25 11:14:06 +08:00
Mahavir Jain
67c7b6f130 Merge branch 'feature/nvs_encryption_usability_improvements' into 'master'
Feature/nvs encryption usability improvements

See merge request espressif/esp-idf!10155
2021-01-22 12:12:26 +08:00
Angus Gratton
3532f52f60 Merge branch 'bugfix/ldgen_ignore_nonexistent_archives_and_obj' into 'master'
ldgen: check mappings

Closes IDF-1624

See merge request espressif/esp-idf!8557
2021-01-21 15:59:35 +08:00
He Yin Ling
b036f6c06d CI: add build ESP32C3 SSC jobs 2021-01-21 03:00:44 +00:00
Aditya Patwardhan
b77c85c1e1 ttfw/IDFDUT: i) Added option to erase_flash in the IDFDUT class
ii) Renamed the method dump_flush to dump_flash
2021-01-20 11:12:14 +00:00
Ivan Grokhotkov
654d4b8d72 Merge branch 'bugfix/ttfw_fix_detect_dut_failed' into 'master'
ttfw: fix get dut failed when dut port is set as env variable

See merge request espressif/esp-idf!11994
2021-01-20 07:43:01 +08:00
morris
9fb95b6fa5 ci: don't allow failure for submodule sync 2021-01-19 17:25:48 +08:00
Renz Bagaporo
d1c800fbbb components: fix ldgen check errors 2021-01-19 11:17:18 +08:00
Renz Bagaporo
8d52b0b5e1 ci: exempt upstream libmbedtls mapping for sha256 2021-01-19 11:17:18 +08:00
Renz Bagaporo
32206d3a7d ci: enabled ldgen mapping check in ci 2021-01-19 11:17:18 +08:00
Angus Gratton
5938b9a892 Merge branch 'feature/support_esp32c3_master_cmake_reset_reason' into 'master'
esp32c3: Add UTs for reset_reason

Closes IDF-2091

See merge request espressif/esp-idf!11546
2021-01-18 07:12:21 +08:00
Konstantin Kondrashov
d23c7690f2 esp32c3: Add UTs for reset_reason 2021-01-18 07:12:21 +08:00
zwj
7c1c669799 component/bt: add BLE v5.0 feature for bluedroid host 2021-01-15 17:55:12 +08:00
He Yin Ling
5befaac4be ttfw: fix get dut failed when dut port is set as env variable 2021-01-14 17:22:11 +08:00
Fu Hanxi
4867b38c74 ci: sonarqube: use exit-code instead of extra job 2021-01-14 11:44:39 +08:00
Angus Gratton
6d3e06a9a3 ttfw: Move TestCaseFailed exception and handle differently to other exceptions
But also ensure the string form of this exception is never empty, if it ends up
somewhere else.
2021-01-12 11:42:03 +11:00
Angus Gratton
441d1306be ci ttfw: Consistently handle unexpected exceptions in test cases 2021-01-12 11:42:03 +11:00
Marius Vikhammer
9c8e4fd4c5 C3: build and run unit tests
Enable building and running of unit tests in CI for C3 as well as fix
related compile errors

Also enables building of C3 test apps
2021-01-11 11:34:37 +08:00
He Yin Ling
97220af848 test: use pyecharts to replace matplotlib in iperf test 2021-01-07 17:10:41 +08:00
He Yin Ling
4e82540730 ttfw: save console log to file 2021-01-07 17:10:40 +08:00
He Yin Ling
16a488c405 test: fix iperf example errors:
1. fix TypeError when running with python3
2. fix throughput chart x/y axis label error
3. make test case compatibile with iperf bin on earlier release branches
2021-01-07 17:10:40 +08:00
Angus Gratton
60ec13b122 Merge branch 'feature/make_uf2' into 'master'
tools: Wrap flash binaries into a UF2 file for flashing through USB MSC

See merge request espressif/esp-idf!11587
2021-01-05 07:17:27 +08:00
Marius Vikhammer
5f130ff909 CI: enable C3 template app 2020-12-31 15:20:05 +11:00
Marius Vikhammer
3458469204 newlib: Update esp32c3 ROM support, use single init function 2020-12-31 09:27:37 +11:00
Angus Gratton
ec75f923ef Merge branch 'ci/raise_esptool_errors' into 'master'
ci: Don't swallow exception details from flashing process

See merge request espressif/esp-idf!11803
2020-12-30 11:22:57 +08:00
Marius Vikhammer
7fe16bae25 tools: merge C3 changes into master 2020-12-30 07:04:12 +08:00
Ivan Grokhotkov
de798541dc tools: use riscv32-esp-elf toolchain for ESP32-S2 RISC-V ULP
riscv32-esp-elf toolchain (used for ESP32-C3) can also be used for
ESP32-S2 RISC-V ULP coprocessor.

This removes the riscv-none-embed-gcc toolchain which was originally
used for the ULP, and updates the docs and CMake files to use
riscv32-esp-elf.

Some flags are cleaned up and workarounds removed from CMake toolchain
file.
2020-12-29 19:19:18 +00:00
Roland Dobai
548ea1bdd5 tools: Wrap flash binaries into a UF2 file for flashing through USB MSC
@mmoskal This commit adds basic support for UF2 into ESP-IDF.
2020-12-29 18:14:47 +01:00
Anton Maklakov
286f06b274 Merge branch 'bugfix/ci_flasher_args_json_dict_items' into 'master'
ci: fix flasher_args.json parser (iterate over dictionary)

Closes IDFCI-347

See merge request espressif/esp-idf!11787
2020-12-29 21:15:12 +08:00
Angus Gratton
88d0d1fa02 ci: Don't swallow exception details from flashing process
If flashing fails, throw an exception that includes some information about the failure.
2020-12-29 15:41:22 +11:00
Angus Gratton
629b4270b4 Merge branch 'feature/c3_mbedtls_merge' into 'master'
mbedtls: merge changes from C3 to master

Closes IDF-2544 and IDF-2114

See merge request espressif/esp-idf!11718
2020-12-29 12:37:08 +08:00
Omar Chebib
fcbc706a66 ci: fix flasher_args.json parser (iterate over dictionary)
Closes IDFCI-347
2020-12-29 12:27:51 +08:00
Angus Gratton
6e006f0443 Merge branch 'bugfix/example_001a_missing_log' into 'master'
CI: bugfix: example_001A missing junit report

See merge request espressif/esp-idf!11706
2020-12-29 11:57:46 +08:00
Marius Vikhammer
1b6891c5d8 mbedtls: merge changes from C3 2020-12-29 10:56:13 +08:00
Ivan Grokhotkov
0b31f6a5fc Merge branch 'feature/ci_flasher_args_json_encrypted_flag' into 'master'
ci: use "encrypted" information in flasher_args.json

Closes IDF-2231

See merge request espressif/esp-idf!11551
2020-12-28 06:37:05 +08:00
Angus Gratton
309d76e986 Merge branch 'feature/support_esp32c3_master_cmake_efuse_to_mater' into 'master'
efuse: Merge C3 efuse changes to master

Closes IDF-2548

See merge request espressif/esp-idf!11719
2020-12-24 11:43:00 +08:00
jiangguangming
867255bbab efuse: Add support ESP32-C3
Updated:
- CSV eFuse table
- Kconfig
- efuse_table_gen.py
- UTs
- espefuse.py

efuse/c3: Fix the burn order of BLOCKs (MAX->0)

efuse/c3: Support efuse API with keys, protection, purpose bits

tool/ci: Adds test_efuse_table_on_host for esp32s3 and esp32c3
2020-12-23 18:39:18 +08:00
Omar Chebib
05f97542b8 ci: use "encrypted" information in flasher_args.json
Take into account the new field "encrypted" that is part of the
partition entries in flasher_args.json file
Closes IDF-2231
2020-12-23 18:16:17 +08:00
Angus Gratton
27a9cf861e driver: Add esp32c3 drivers (except ADC/DAC) and update tests
Some ESP32-C3 drivers are still pending.

Based on internal commit 3ef01301fffa552d4be6d81bc9d199c223224305
2020-12-23 09:53:24 +11:00
Fu Hanxi
046b054a96 CI: bugfix: example_001a missing junit report 2020-12-22 15:04:20 +08:00
Ivan Grokhotkov
19498791a5 cmake: set IDF_VERSION_* variables at requirement expansion stage
Currently IDF_VERSION_* variables are not available to the component
CMakeLists.txt files at the requirements expansion stage. This makes
it harder to write component CMakeLists files compatible with
different IDF versions.

Include version.cmake from the requirements expansion script, add a
build system test.
2020-12-15 20:53:19 +01:00
Ivan Grokhotkov
e400a1f5b0 Merge branch 'feature/panic_test_multi_target_support' into 'master'
CI: Add multi-target support for panic test

See merge request espressif/esp-idf!11451
2020-12-16 00:01:11 +08:00
Fu Hanxi
0f96b70294 ci: add esp32s2 support for panic test 2020-12-15 17:57:21 +08:00
Ivan Grokhotkov
e32885d699 tools/test_apps: run tests which don't need JTAG on Example_GENERIC 2020-12-15 17:56:53 +08:00
Fu Hanxi
eda42035d2 scan test: bugfix: now can build multi target for one app 2020-12-15 17:56:53 +08:00
Fu Hanxi
3a88626ec3 search case: print target as well 2020-12-15 17:56:53 +08:00
Fu Hanxi
a5bcaea9cc use "additional_duts" to overwrite dut class for different targets 2020-12-15 17:55:54 +08:00
Anton Maklakov
cfcc18719d ci: Ignore Python 2 deprecation warning 2020-12-15 12:24:50 +07:00
Ivan Grokhotkov
af43e34839 Merge branch 'bugfix/drop_make_support_when_esp32_not_supported' into 'master'
CI: drop make support when esp32 not supported

See merge request espressif/esp-idf!11510
2020-12-14 15:51:44 +08:00
Krzysztof Budzynski
1f6d2b0257 Merge branch 'feature/doc_kconfig_default_and_range' into 'master'
tools: show defaults and ranges in generated kconfig documentation

Closes IDF-1816 and IDF-1679

See merge request espressif/esp-idf!10875
2020-12-11 16:40:11 +08:00
Fu Hanxi
49fd495689 check_examples_cmake_make: now it can run not only under idf path 2020-12-08 14:54:30 +08:00
Angus Gratton
51d03aeced Merge branch 'bugfix/tools_python_subprocess_capture_output' into 'master'
tools: Avoid subprocess.run(capture_output) argument for Python <3.7 compatibility

See merge request espressif/esp-idf!11493
2020-12-08 06:43:07 +08:00
Anton Maklakov
7ad35fa5bb Merge branch 'bugfix/github_sync_artifacts' into 'master'
ci: don't fetch artifacts in push_to_github

See merge request espressif/esp-idf!11104
2020-12-07 16:20:01 +08:00
Angus Gratton
94fe736bc5 tools: Avoid subprocess.run(capture_output) argument for Python <3.7 compatibility
In Python 3.5 and 3.6 the equivalent to capture_output=True is to set stdout
and stderr arguments to subprocess.PIPE
2020-12-07 15:01:10 +11:00
Konstantin Kondrashov
4a487af43a efuse: Add new APIs for keys, purposes, wr/rd protection
- the batch mode can be called recursively
2020-12-04 10:42:57 +08:00
martin.gano
f4ea2dcb74 Tools: add Python 2 deprecation warning 2020-12-02 11:08:48 +01:00
Angus Gratton
0f8afff021 Merge branch 'test/enable_esp32s2_ut_by_default' into 'master'
CI: enable esp32s2 ut jobs by default

See merge request espressif/esp-idf!9237
2020-12-02 08:33:18 +08:00
Roland Dobai
c31dab51a0 Show defaults and ranges in generated kconfig documentation 2020-11-30 09:51:50 +00:00
Fu Hanxi
7281a5a0cc Split component_ut tests based on targets
- add more label in CIScanTest.py
- fix the bug that will cause labels not iterate correctly
2020-11-30 14:08:54 +08:00
Fu Hanxi
6fd2d27bfd Make sure "unit_test" will trigger all labels
- keep labels name consist with the bot variable
2020-11-30 11:44:37 +08:00
He Yin Ling
6e545215c1 ci: enable ESP32S2 unit test by default 2020-11-30 11:34:51 +08:00
Fu Hanxi
4bd2130eab set dependencies to null to avoid missing artifacts issue 2020-11-27 19:11:59 +08:00
Fu Hanxi
22168a7910 remove all pre-stage artifacts in build stage jobs 2020-11-27 19:03:25 +08:00
Fu Hanxi
9e4f5dd01f CI: Add dependency "fast_template_app" to build jobs 2020-11-27 19:03:25 +08:00
Fu Hanxi
7c5eb76113 delete unused variable 2020-11-27 19:03:25 +08:00
Angus Gratton
190aed41ee Merge branch 'bugfix/ttfw_example_test_fails_port_remains_open' into 'master'
ci: Fix CI issue if one example test fails, and if serial port returns some noise

Closes IDFCI-236

See merge request espressif/esp-idf!11273
2020-11-26 08:04:00 +08:00
Angus Gratton
26fb74bc97 ci: ttfw: Encode serial port data to whatever the console encoding is
This is a bit of a hack, but gives us a way to always log it
2020-11-24 18:32:47 +11:00
Angus Gratton
37838803db ci: Log failure to close any DUT 2020-11-24 18:32:47 +11:00
Fu Hanxi
10df5b3a7c CI: clarify file patterns in sonar_exclude_list.txt 2020-11-24 13:39:18 +08:00
Angus Gratton
403fdf8e9c Merge branch 'bugfix/fix_ttfw_idf_performance_check_not_work' into 'master'
ttfw: fix ttfw_idf performance check not work

See merge request espressif/esp-idf!10001
2020-11-23 14:50:18 +08:00
Angus Gratton
17fea25f45 Merge branch 'ci/fix_annotated_tag_check' into 'master'
ci: Fix annotated tag check

See merge request espressif/esp-idf!11324
2020-11-23 14:35:31 +08:00
Angus Gratton
a47e207a7e ci: Fix annotated tag check
Regression in 1612f84
2020-11-23 10:23:24 +11:00
Chen Yu Dong
454edcc0a8 ci: all jobs use python3 by default 2020-11-19 03:27:58 +00:00
Ivan Grokhotkov
7f9c84032e Merge branch 'ci/build_example_cmake_artifacts_always' into 'master'
bugfix: CI: build_example_cmake artifacts uploaded only when succeeded

See merge request espressif/esp-idf!11279
2020-11-18 21:18:17 +08:00
Fu Hanxi
27c23418ad bugfix: CI: build_example_cmake artifacts uploaded only when succeeded 2020-11-18 17:26:33 +08:00
Anton Maklakov
e0c9260976 Merge branch 'ci/pre-commit_windows_improvements' into 'master'
pre-commit: recognize Windows excecutable files with git

See merge request espressif/esp-idf!11211
2020-11-18 16:15:18 +08:00
Angus Gratton
0444a0fe2a ci: Increase test job count 2020-11-17 18:19:35 +11:00
Angus Gratton
c9fdc8a167 Merge branch 'bugfix/fix-autocomplete-tests' into 'master'
Add waiting for export script finish

Closes IDFCI-218

See merge request espressif/esp-idf!11216
2020-11-17 07:33:16 +08:00
Angus Gratton
6ce34a227e Merge branch 'feature/fatfs_fast_seek' into 'master'
feature/fatfs: enable the usage of fast-seek algorithm

See merge request espressif/esp-idf!9916
2020-11-17 07:17:31 +08:00
Anton Maklakov
df2b949544 Merge branch 'bugfix/run_build_docs_preview_only_with_label' into 'master'
CI: run build_docs_preview only with the label

Closes IDFCI-208

See merge request espressif/esp-idf!11186
2020-11-16 12:10:09 +08:00
martin.gano
978b5308e8 Close files after writing. 2020-11-13 15:22:46 +01:00
Anton Maklakov
b6efdf48d3 Merge branch 'bugfix/sonarqube_wrong_variable_name' into 'master'
CI: sonarqube: unmatched variable name always skip the job

See merge request espressif/esp-idf!11215
2020-11-13 20:16:17 +08:00
Angus Gratton
935e4b4d62 Merge branch 'feature/riscv_arch' into 'master'
Add RISC-V support

Closes IDF-2359

See merge request espressif/esp-idf!11140
2020-11-13 07:50:31 +08:00
Angus Gratton
53fa8da673 Merge branch 'bugfix/check_doc_links_no_deploy' into 'master'
CI: Only run check_doc_links if we actually deployed

Closes IDFCI-169

See merge request espressif/esp-idf!10939
2020-11-13 04:53:27 +08:00
Angus Gratton
87e13baaf1 freertos: Add RISC-V port
Changes come from internal branch commit a6723fc
2020-11-13 07:49:11 +11:00
Fu Hanxi
6e4d2503e9 CI: sonarqube: unmatched variable name always skip the job 2020-11-12 23:03:38 +08:00
martin.gano
1287056878 Temporary disable autocomplete test 2020-11-12 11:59:12 +01:00
Fu Hanxi
0a8a99c17b pre-commit: recognize Windows excecutable files with git 2020-11-12 17:52:31 +08:00
He Yin Ling
e568daf213 ttfw: fix idf performance check doesn't work 2020-11-12 09:49:44 +00:00
Fu Hanxi
c600a6d840 CI: run build_docs_preview only with the label 2020-11-12 06:44:38 +00:00
Marius Vikhammer
71b24f0518 CI: Only run check_doc_links if we actually deployed
Update the check_doc_links job run conditions to match
github/doc deploy as a lot of the links link to github files.
2020-11-12 06:32:10 +00:00
Mahavir Jain
0fb65d0bae Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path' into 'master'
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one

Closes IDFCI-217

See merge request espressif/esp-idf!11187
2020-11-12 12:12:51 +08:00
Ivan Grokhotkov
f5939c9e68 Merge branch 'bugfix/unset-temp-procedure-and-redirect-to-stderr' into 'master'
Tools: Avoid printing warnings in idf.py when autocompleting

Closes IDFCI-207

See merge request espressif/esp-idf!11159
2020-11-12 05:27:32 +08:00
martin.gano
304cff9f75 Redirect warning to stderr and unset temporary shell procedure 2020-11-11 15:12:58 +01:00
Shubham Kulkarni
cda61a87da Update OTA example to demonstate anti_rollback feature
Add example_test for anti_rollback feature
2020-11-11 11:51:28 +00:00
Angus Gratton
66fb5a29bb Whitespace: Automated whitespace fixes (large commit)
Apply the pre-commit hook whitespace fixes to all files in the repo.

(Line endings, blank lines at end of file, trailing whitespace)
2020-11-11 07:36:35 +00:00
Angus Gratton
8c0e5ecbea ci: Remove tools/ci/utils.sh from executable list 2020-11-11 07:36:35 +00:00
Fu Hanxi
5fa935e5ea CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one 2020-11-11 12:31:39 +08:00
David Cermak
fb0f7e9077 ci: increase parallel job count for S2 unit tests 2020-11-09 21:41:51 +01:00
Ivan Grokhotkov
256333ca13 Merge branch 'ci/add_pre_commit_for_some_pre_check_jobs' into 'master'
CI: Add pre-commit for IDF project

See merge request espressif/esp-idf!10682
2020-11-06 20:16:27 +08:00
Ivan Grokhotkov
64c5b64996 Merge branch 'ci/renable_deploy_docs_production' into 'master'
CI: Renable deploy_docs_production

See merge request espressif/esp-idf!11075
2020-11-06 20:15:37 +08:00
Ivan Grokhotkov
e9e6d970f3 Merge branch 'feature/add-shell-autocompletion' into 'master'
idf.py: Enable autocompletion for command idf.py

Closes IDF-1540

See merge request espressif/esp-idf!10742
2020-11-06 20:14:38 +08:00
Anton Maklakov
85cad7c168 Merge branch 'bugfix/component_ut_variable_missing' into 'master'
CI: fix component ut variable missing error

See merge request espressif/esp-idf!11120
2020-11-06 17:26:45 +08:00
Ivan Grokhotkov
5dd16db1d6 Merge branch 'feature/esp_event_cxx' into 'master'
C++: ESP Event wrapper classes

Closes IDF-1048 and IDF-232

See merge request espressif/esp-idf!9602
2020-11-06 17:24:34 +08:00
Fu Hanxi
957e3b225a CI: fix component ut variable missing error 2020-11-06 02:18:37 +00:00
Felipe Neves
93ffc009ef vfs: restrict the fast seek for read-only files
Since the files under fast-seek cannot be expanded with further writes, it does not
make sense to enable fast-seek which may fail in write-mode files
2020-11-05 17:01:50 -03:00
Felipe Neves
32e760adfb fat_vfs: added fast seek capable file operation 2020-11-05 17:01:50 -03:00
Ivan Grokhotkov
b178780d52 Merge branch 'bugfix/missing_assign_test_variable' into 'master'
CI: fix missing variables issue in assign_test

See merge request espressif/esp-idf!11111
2020-11-04 18:58:35 +08:00
Fu Hanxi
64fc8072b4 bugfix: variable missing in assign_test 2020-11-04 16:48:30 +08:00
Anton Maklakov
b5b2738644 Merge branch 'test/ci_fuzzer_precheck' into 'master'
CI: Add a test to pre-check fuzzer tests compilation before weekly run

See merge request espressif/esp-idf!10332
2020-11-04 12:22:53 +08:00
Fu Hanxi
09c8777c22 Renable deploy_docs_production 2020-11-04 03:10:50 +00:00
martin.gano
346b002d9a enable autocompletion for command idf.py 2020-11-03 23:27:58 +01:00
Ivan Grokhotkov
0f127fcb62 ci: don't fetch artifacts in push_to_github 2020-11-03 16:46:51 +01:00
Fu Hanxi
47a97d2b52 check_kconfigs and check_deprecated_kconfigs now use files arguments 2020-11-02 15:49:13 +08:00
Fu Hanxi
bcc8f2628c CI: Add pre-commit for esp-idf project.
add tools/ci/python_packages/idf_ci.py for some util functions used in
ci and needs multi-os solution
2020-11-02 15:49:13 +08:00
Chen Yu Dong
9e8315d9b3 ci: limit switching branches for auto_test_script 2020-11-02 06:59:13 +00:00
Michael (XIAO Xufeng)
23584e094f Merge branch 'feature/esp_flash_32b_addr' into 'master'
esp_flash: support high capacity flash chips (32-bit address)

See merge request espressif/esp-idf!9475
2020-10-30 15:22:44 +08:00
Ivan Grokhotkov
5341d20318 Merge branch 'bugfix/shell_test_script_missing_in_test_build_system_macos' into 'master'
Bugfix: missing `SHELL_TEST_SCRIPT` in job `test_build_system_cmake_macos`

See merge request espressif/esp-idf!11031
2020-10-30 03:20:39 +08:00
Fu Hanxi
09d4774a0a CI: Temperaroily disable deploy_docs_production since needs has a bug which will be fixed in GitLab 13.4 2020-10-29 18:33:18 +08:00
Michael (XIAO Xufeng)
3bacf35310 esp_flash: support high capacity flash chips (32-bit address) 2020-10-29 18:20:11 +08:00
Anton Maklakov
54e8ec29b2 Merge branch 'test/ci_assign_test_regular' into 'master'
ci: add assign_test into regular test

See merge request espressif/esp-idf!10998
2020-10-29 16:13:32 +08:00
Angus Gratton
654a827d7b Merge branch 'bugfix/docs_push_production_without_push_to_github' into 'master'
bugfix: Run `deploy_docs_production` in `post_deploy` stage after `push_to_github` successfully

See merge request espressif/esp-idf!11028
2020-10-29 15:18:01 +08:00
Fu Hanxi
6a9ff50610 Bugfix: missing SHELL_TEST_SCRIPT in job test_build_system_cmake_macos 2020-10-29 10:44:50 +08:00
Fu Hanxi
78134907a2 bugfix: Run deploy_docs_production in post_deploy stage after push_to_github successfully 2020-10-29 09:45:43 +08:00
Angus Gratton
8f3393afdf Merge branch 'refactor/create_esp_hw_support' into 'master'
Create esp_hw_support

Closes IDF-2161

See merge request espressif/esp-idf!10513
2020-10-29 07:51:46 +08:00
Renz Bagaporo
bea280c948 ci: increase s2 test jobs 2020-10-28 22:38:50 +08:00
Renz Bagaporo
6b0a5af73e soc: move implementations to esp_hw_support 2020-10-28 22:38:50 +08:00
Michael (XIAO Xufeng)
2ce058e100 ci: add assign_test into regular test 2020-10-28 16:32:54 +08:00
Anton Maklakov
b1d98e519d Merge branch 'ci/refactor_ci_yaml' into 'master'
CI: Refactor CI rules into separate yaml file: rules.yml

See merge request espressif/esp-idf!10634
2020-10-28 11:09:01 +08:00
morris
9de6cba434 ci: add more build test for esp32-s3 2020-10-27 17:22:17 +08:00
David Cermak
8d6e03a529 ci: increase parallel job count for S2 unit tests 2020-10-26 16:00:42 +00:00
Fu Hanxi
75ab9223f9 scan test when weekend test. 2020-10-26 10:25:21 +08:00
Fu Hanxi
3026d562ec add README.md to explain how to add/modify jobs/rules/ifs
- rename existing labels to fit the naming convention
2020-10-26 10:25:21 +08:00