Merge branch 'develop' into develop
This commit is contained in:
commit
e0740d72f1
|
@ -0,0 +1,79 @@
|
||||||
|
# For most projects, this workflow file will not need changing; you simply need
|
||||||
|
# to commit it to your repository.
|
||||||
|
#
|
||||||
|
# You may wish to alter this file to override the set of languages analyzed,
|
||||||
|
# or to provide custom queries or build logic.
|
||||||
|
#
|
||||||
|
# ******** NOTE ********
|
||||||
|
# We have attempted to detect the languages in your repository. Please check
|
||||||
|
# the `language` matrix defined below to confirm you have the correct set of
|
||||||
|
# supported CodeQL languages.
|
||||||
|
#
|
||||||
|
name: "CodeQL"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ master, develop ]
|
||||||
|
pull_request:
|
||||||
|
# The branches below must be a subset of the branches above
|
||||||
|
branches: [ master, develop ]
|
||||||
|
schedule:
|
||||||
|
- cron: '16 17 * * 2'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
analyze:
|
||||||
|
name: Analyze
|
||||||
|
runs-on: ubuntu-18.04
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
language: [ 'cpp' ]
|
||||||
|
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
||||||
|
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
# Initializes the CodeQL tools for scanning.
|
||||||
|
- name: Initialize CodeQL
|
||||||
|
uses: github/codeql-action/init@v1
|
||||||
|
with:
|
||||||
|
languages: ${{ matrix.language }}
|
||||||
|
config-file: ./.github/workflows/codeql/codeql-config.yml
|
||||||
|
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||||
|
# By default, queries listed here will override any specified in a config file.
|
||||||
|
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||||
|
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||||
|
|
||||||
|
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||||
|
# If this step fails, then you should remove it and run the build manually (see below)
|
||||||
|
# - name: Autobuild
|
||||||
|
# uses: github/codeql-action/autobuild@v1
|
||||||
|
|
||||||
|
# ℹ️ Command-line programs to run using the OS shell.
|
||||||
|
# 📚 https://git.io/JvXDl
|
||||||
|
|
||||||
|
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||||
|
# and modify them (or add more) to build your code if your project
|
||||||
|
# uses a compiled language
|
||||||
|
|
||||||
|
- if: matrix.language == 'cpp' || matrix.language == 'c'
|
||||||
|
name: Build
|
||||||
|
run: |
|
||||||
|
ls
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y gcc git wget make libncurses-dev flex bison python python-setuptools python-serial ninja-build
|
||||||
|
wget https://dl.espressif.com/dl/xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
|
||||||
|
tar -xzf ./xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0.tar.gz
|
||||||
|
python -m pip install --user -r ./ESP8266_RTOS_SDK/requirements.txt
|
||||||
|
export IDF_PATH=$PWD/ESP8266_RTOS_SDK
|
||||||
|
export PATH="$PATH:$PWD/xtensa-lx106-elf/bin"
|
||||||
|
python ./idf.py fullclean
|
||||||
|
python ./idf.py build
|
||||||
|
|
||||||
|
- name: Perform CodeQL Analysis
|
||||||
|
uses: github/codeql-action/analyze@v1
|
|
@ -0,0 +1,6 @@
|
||||||
|
name: "My CodeQL config"
|
||||||
|
|
||||||
|
languages: cpp
|
||||||
|
|
||||||
|
paths-ignore:
|
||||||
|
- ESP8266_RTOS_SDK
|
|
@ -6,9 +6,11 @@ on:
|
||||||
- '**.md'
|
- '**.md'
|
||||||
- 'circuit'
|
- 'circuit'
|
||||||
|
|
||||||
|
|
||||||
# env:
|
# env:
|
||||||
# UPLOAD_USER_FIRMWARE: false
|
# UPLOAD_USER_FIRMWARE: false
|
||||||
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
test
|
||||||
<p align="center"><img src="https://user-images.githubusercontent.com/17078589/120061980-49274280-c092-11eb-9916-4965f6c48388.png"/></p>
|
<p align="center"><img src="https://user-images.githubusercontent.com/17078589/120061980-49274280-c092-11eb-9916-4965f6c48388.png"/></p>
|
||||||
|
|
||||||

|

|
||||||
|
@ -357,3 +358,4 @@ Credits to the following project, people and organizations:
|
||||||
## License
|
## License
|
||||||
|
|
||||||
[MIT LICENSE](LICENSE)
|
[MIT LICENSE](LICENSE)
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,7 @@ void app_main() {
|
||||||
mdns_setup();
|
mdns_setup();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if (USE_OTA == 1)
|
#if (USE_OTA == 1)
|
||||||
co_handle_t handle;
|
co_handle_t handle;
|
||||||
co_config_t config = {
|
co_config_t config = {
|
||||||
|
|
Loading…
Reference in New Issue