From fb2aa59145db9e9ad205fda70616d2b748d3402d Mon Sep 17 00:00:00 2001 From: Pedro Minatel Date: Mon, 17 Jul 2023 11:57:25 +0100 Subject: [PATCH 1/3] Add .readthedocs.yaml configuration file (#8352) * Added the ReadTheDocs configuration file * File renamed to YAML --- .github/workflows/docs.yml | 4 ++-- .readthedocs.yaml | 20 ++++++++++++++++++++ .readthedocs.yml | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 .readthedocs.yaml create mode 100644 .readthedocs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3c76df5f741..f01fb76ee84 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,7 +17,7 @@ jobs: build-docs: name: Build ReadTheDocs - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 defaults: run: shell: bash @@ -27,7 +27,7 @@ jobs: submodules: true - uses: actions/setup-python@v4 with: - python-version: '3.x' + python-version: '3.10' - name: Build run: | sudo apt update diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 00000000000..259c19f98fd --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,20 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.10" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/source/conf.py + +python: + install: + - requirements: docs/requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 00000000000..fb24fa160d8 --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,22 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.10" + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +# python: +# install: +# - requirements: docs/requirements.txt \ No newline at end of file From 21b88659b9ded3fcc1082f23f498bc2a04cd4f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Barto=C5=A1ka?= <76958047+VojtechBartoska@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:58:11 +0200 Subject: [PATCH 2/3] Add v2.0.10 into issue template (#8425) --- .github/ISSUE_TEMPLATE/Issue-report.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml index 8faa0f759ef..05d929c87b9 100644 --- a/.github/ISSUE_TEMPLATE/Issue-report.yml +++ b/.github/ISSUE_TEMPLATE/Issue-report.yml @@ -41,6 +41,7 @@ body: options: - latest master (checkout manually) - latest development Release Candidate (RC-X) + - v2.0.10 - v2.0.9 - v2.0.8 - v2.0.7 From ae9dae4a6c063d95786d95b6770b70693e132a7d Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 24 Jul 2023 10:36:39 +0300 Subject: [PATCH 3/3] Update version to 2.0.11 --- cores/esp32/esp_arduino_version.h | 2 +- package.json | 2 +- platform.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cores/esp32/esp_arduino_version.h b/cores/esp32/esp_arduino_version.h index 01cd1b0edd5..bdc822b75a7 100644 --- a/cores/esp32/esp_arduino_version.h +++ b/cores/esp32/esp_arduino_version.h @@ -23,7 +23,7 @@ extern "C" { /** Minor version number (x.X.x) */ #define ESP_ARDUINO_VERSION_MINOR 0 /** Patch version number (x.x.X) */ -#define ESP_ARDUINO_VERSION_PATCH 10 +#define ESP_ARDUINO_VERSION_PATCH 11 /** * Macro to convert ARDUINO version number into an integer diff --git a/package.json b/package.json index 49272e1243b..4fe769c421c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "framework-arduinoespressif32", - "version": "2.0.10", + "version": "2.0.11", "description": "Arduino Wiring-based Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs", "keywords": [ "framework", diff --git a/platform.txt b/platform.txt index f56846011bf..970107849fe 100644 --- a/platform.txt +++ b/platform.txt @@ -1,5 +1,5 @@ name=ESP32 Arduino -version=2.0.10 +version=2.0.11 tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf