From d07fb6517ca1d99ec3b9aa4aa9ec5b46d2ce2ebb Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Wed, 4 May 2022 16:57:04 +0200 Subject: [PATCH 1/2] CI: bump python from 2 to 3 and update versions --- .github/workflows/test.platformio.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.platformio.yml b/.github/workflows/test.platformio.yml index 8e06241..95da700 100644 --- a/.github/workflows/test.platformio.yml +++ b/.github/workflows/test.platformio.yml @@ -5,26 +5,26 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest - timeout-minutes: 20 + timeout-minutes: 40 strategy: fail-fast: false max-parallel: 20 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 - name: Install PlatformIO run: | python -m pip install --upgrade pip From 21bb7c27c71e937a28f3f80103ecedb444bc7e7d Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Fri, 5 Aug 2022 17:46:47 +0200 Subject: [PATCH 2/2] Fix: arduino-esp32 v2 now includes LittleFS --- examples/IotWebConf17JsonConfig/platformio.ini | 1 - examples/IotWebConf17JsonConfig/src/main.cpp | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/examples/IotWebConf17JsonConfig/platformio.ini b/examples/IotWebConf17JsonConfig/platformio.ini index ca62865..fac9c88 100644 --- a/examples/IotWebConf17JsonConfig/platformio.ini +++ b/examples/IotWebConf17JsonConfig/platformio.ini @@ -29,4 +29,3 @@ build_flags = ;upload_port = /dev/cu.SLAB_USBtoUART lib_deps = ${common.lib_deps} - lorol/LittleFS_esp32 diff --git a/examples/IotWebConf17JsonConfig/src/main.cpp b/examples/IotWebConf17JsonConfig/src/main.cpp index f0d42bb..edfa5a1 100644 --- a/examples/IotWebConf17JsonConfig/src/main.cpp +++ b/examples/IotWebConf17JsonConfig/src/main.cpp @@ -15,12 +15,7 @@ #include #include // This loads aliases for easier class names. -#ifndef ESP32 -# include -#else -# include -# define LittleFS LITTLEFS -#endif +#include #include #ifndef IOTWEBCONF_ENABLE_JSON