Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/fix_set_locked_channel_typo_of_smartconfig' into 'release/v2.1'

Browse source 
fix set locked channel typo of smartconfig

See merge request !1156
This commit is contained in:
Ivan Grokhotkov 2017-09-19 14:06:33 +08:00
parent 7138fb0290 3062790128
commit 00b5f82c41
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.gitlab-ci.yml
View file

@ -41,7 +41,7 @@ before_script:
build_template_app: build_template_app:
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build - build
variables: variables:
@ -69,7 +69,7 @@ build_template_app:
.build_template: &build_template .build_template: &build_template
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build - build
variables: variables:
@ -154,7 +154,7 @@ build_examples_04:
build_docs: build_docs:
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build_docs - build_docs
artifacts: artifacts:
@ -171,7 +171,7 @@ build_docs:
test_nvs_on_host: test_nvs_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- nvs_host_test - nvs_host_test
dependencies: [] dependencies: []
@ -181,7 +181,7 @@ test_nvs_on_host:
test_partition_table_on_host: test_partition_table_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build - build
dependencies: [] dependencies: []
@ -191,7 +191,7 @@ test_partition_table_on_host:
test_wl_on_host: test_wl_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- wl_host_test - wl_host_test
artifacts: artifacts:
@ -204,7 +204,7 @@ test_wl_on_host:
test_build_system: test_build_system:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build_test - build_test
dependencies: [] dependencies: []
@ -214,7 +214,7 @@ test_build_system:
test_report: test_report:
stage: test_report stage: test_report
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- report - report
only: only:
@ -269,7 +269,7 @@ push_master_to_github:
before_script: before_script:
- echo "Not setting up GitLab key, not fetching submodules" - echo "Not setting up GitLab key, not fetching submodules"
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- deploy - deploy
only: only:
@ -300,7 +300,7 @@ deploy_docs:
before_script: before_script:
- echo "Not setting up GitLab key, not fetching submodules" - echo "Not setting up GitLab key, not fetching submodules"
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- deploy - deploy
only: only:
@ -326,7 +326,7 @@ deploy_docs:
check_doc_links: check_doc_links:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- check_doc_links - check_doc_links
only: only:
@ -346,7 +346,7 @@ check_doc_links:
check_commit_msg: check_commit_msg:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build - build
except: except:
@ -363,7 +363,7 @@ check_commit_msg:
check_submodule_sync: check_submodule_sync:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env:v2.1
tags: tags:
- build - build
except: except:

2
components/esp32/lib

@ -1 +1 @@
Subproject commit c225bf8bcae52652733d577e37fa1affe370caf4 Subproject commit f6701dcdd52625ba3d84d27df0dd2d95e7891921