From 0b671b7c61bac4ab32690090df5964e6dac5b826 Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Wed, 29 May 2024 21:50:13 +0530 Subject: [PATCH] fix: updated CI --- .github/scripts/dep-install.sh | 5 -- .github/workflows/ci.yml | 115 ++++++++++++++++++++++++++------- .gitignore | 4 +- library.json | 10 ++- platformio.ini | 39 +++++++++++ 5 files changed, 142 insertions(+), 31 deletions(-) delete mode 100644 .github/scripts/dep-install.sh create mode 100644 platformio.ini diff --git a/.github/scripts/dep-install.sh b/.github/scripts/dep-install.sh deleted file mode 100644 index fa1dd8e..0000000 --- a/.github/scripts/dep-install.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -cd ${HOME}/Arduino/libraries -git clone https://github.com/me-no-dev/ESPAsyncWebServer.git ESPAsyncWebServer -git clone https://github.com/me-no-dev/ESPAsyncTCP.git ESPAsyncTCP -git clone https://github.com/me-no-dev/AsyncTCP.git AsyncTCP diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e54bfa..a91c373 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,44 +1,111 @@ name: Arduino Library CI -on: +on: push: paths-ignore: - - '**/**.md' - - '/keywords.txt' - - '/library.json' - - '/library.properties' - - '/ui' - - '/docs' + - "**/**.md" + - "/keywords.txt" + - "/library.json" + - "/library.properties" + - "/vue-frontend" + - "/docs" pull_request: paths-ignore: - - '**/**.md' - - '/keywords.txt' - - '/library.json' - - '/library.properties' - - '/ui' - - '/docs' + - "**/**.md" + - "/keywords.txt" + - "/library.json" + - "/library.properties" + - "/vue-frontend" + - "/docs" jobs: - build: + arduino: + name: arduino ${{ matrix.platform }} runs-on: ubuntu-latest - + strategy: + fail-fast: false + matrix: + platform: [esp8266, esp32] + steps: - uses: actions/setup-python@v1 with: - python-version: '3.x' - + python-version: "3.x" + - uses: actions/checkout@v2 - uses: actions/checkout@v2 with: - repository: ayushsharma82/ci-arduino - path: ci + repository: ayushsharma82/ci-arduino + path: ci - name: pre-install run: bash ci/actions_install.sh - - - name: install-deps - run: bash .github/scripts/dep-install.sh - - name: test platforms - run: python3 ci/build_platform.py esp8266 esp32 + - name: Set configuration + run: arduino-cli config set library.enable_unsafe_install true + + - name: Install AsyncTCP + run: arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.2 + + - name: Install ESPAsyncWebServer + run: arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v2.10.0 + + - name: Install ESPAsyncTCP + run: arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0 + + - name: Build Examples + run: python3 ci/build_platform.py ${{ matrix.platform }} + + platformio: + name: pio ${{ matrix.name }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - name: esp32dev|arduino + board: esp32dev + platform: espressif32 + opts: + - name: esp32dev|arduino-2 + board: esp32dev + platform: espressif32@6.7.0 + opts: + - name: esp32dev|arduino-3 + board: esp32dev + platform: espressif32 + opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.0/esp32-arduino-libs-3.0.0.zip'" + - name: esp32-s3-devkitc-1|arduino + board: esp32-s3-devkitc-1 + platform: espressif32 + opts: + - name: esp32-s3-devkitc-1|arduino-2 + board: esp32-s3-devkitc-1 + platform: espressif32@6.7.0 + opts: + - name: esp32-s3-devkitc-1|arduino-3 + board: esp32-s3-devkitc-1 + platform: espressif32 + opts: "--project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.0/esp32-arduino-libs-3.0.0.zip'" + - name: huzzah|espressif8266 + board: huzzah + platform: espressif8266 + opts: + steps: + - uses: actions/checkout@v4 + - name: Set up cache + uses: actions/cache@v4 + with: + path: | + ~/.platformio + ~/.cache/pip + key: ${{ matrix.name }} + - uses: actions/setup-python@v5 + with: + python-version: "3.x" + - run: pip install platformio + - run: platformio platform install ${{ matrix.platform }} + + - run: platformio ci "examples/Demo/Demo.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }} + - run: platformio ci "examples/Demo_AP/Demo_AP.ino" -l '.' -b ${{ matrix.board }} ${{ matrix.opts }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index b9eeceb..bcae145 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,6 @@ Module.symvers Mkfile.old dkms.conf -portal/ +/portal +/.pio +/logs \ No newline at end of file diff --git a/library.json b/library.json index ad87e38..b383120 100644 --- a/library.json +++ b/library.json @@ -17,5 +17,13 @@ ], "version": "2.0.0", "frameworks": "arduino", - "platforms": ["espressif8266", "espressif32"] + "platforms": ["espressif8266", "espressif32"], + "dependencies": [ + { + "owner": "mathieucarbou", + "name": "ESP Async WebServer", + "version": "^2.10.0", + "platforms": ["espressif8266", "espressif32"] + } + ] } diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 0000000..9f85645 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,39 @@ +[env] +framework = arduino +build_flags = + -Wall -Wextra + -D CONFIG_ARDUHAL_LOG_COLORS + -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG +lib_deps = + mathieucarbou/Async TCP @ ^3.1.2 + mathieucarbou/ESP Async WebServer @ 2.10.0 +upload_protocol = esptool +monitor_speed = 115200 +monitor_filters = esp32_exception_decoder, log2file + +[platformio] +lib_dir = . +src_dir = examples/Demo +; src_dir = examples/Demo_AP + +[env:arduino] +platform = espressif32 +board = esp32-s3-devkitc-1 + +[env:arduino-2] +platform = espressif32@6.7.0 +board = esp32-s3-devkitc-1 + +[env:arduino-3] +platform = espressif32 +platform_packages= + platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.0 + platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.0/esp32-arduino-libs-3.0.0.zip +board = esp32-s3-devkitc-1 + +[env:esp8266] +platform = espressif8266 +board = huzzah +lib_deps = + mathieucarbou/ESP Async WebServer @ 2.10.0 + esphome/ESPAsyncTCP-esphome @ 2.0.0 \ No newline at end of file