Skip to content

Commit 2a6b758

Browse files
authored
Merge branch 'esp8266:master' into pr-postmortem-extension
2 parents 2716f3c + 78d0d0a commit 2a6b758

File tree

88 files changed

+2190
-1255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2190
-1255
lines changed

.github/workflows/build-host.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run:
1818
shell: bash
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
with:
2222
submodules: true
2323
- run: |
@@ -32,7 +32,7 @@ jobs:
3232
run:
3333
shell: bash
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
3737
submodules: true
3838
- run: |

.github/workflows/build-ide.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run:
1818
shell: bash
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
with:
2222
submodules: false
2323
- uses: actions/cache@v4
@@ -39,7 +39,7 @@ jobs:
3939
lwip: ["default", "IPv6"]
4040
chunk: [0, 1, 2, 3, 4, 5, 6, 7]
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
with:
4444
submodules: true
4545
- uses: actions/setup-python@v5
@@ -52,7 +52,6 @@ jobs:
5252
- name: Build Sketches
5353
env:
5454
ESP8266_ARDUINO_BUILDER: "arduino"
55-
ESP8266_ARDUINO_IDE: "${{ runner.temp }}/arduino_ide"
5655
ESP8266_ARDUINO_LWIP: ${{ matrix.lwip }}
5756
run: |
5857
bash ./tests/build.sh 8 ${{ matrix.chunk }}
@@ -63,7 +62,7 @@ jobs:
6362
name: Windows
6463
runs-on: windows-latest
6564
steps:
66-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v5
6766
with:
6867
submodules: false
6968
- uses: actions/setup-python@v5
@@ -75,8 +74,6 @@ jobs:
7574
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
7675
- name: Build Sketch
7776
env:
78-
ESP8266_ARDUINO_HARDWARE: "${{ runner.temp }}/hardware"
79-
ESP8266_ARDUINO_IDE: "${{ runner.temp }}/arduino_ide"
8077
ESP8266_ARDUINO_SKETCHES: "libraries/esp8266/examples/Blink/Blink.ino"
8178
run: |
8279
bash ./tests/build.sh
@@ -88,7 +85,7 @@ jobs:
8885
run:
8986
shell: bash
9087
steps:
91-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
9289
with:
9390
submodules: false
9491
- uses: actions/setup-python@v5
@@ -100,8 +97,6 @@ jobs:
10097
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
10198
- name: Build Sketch
10299
env:
103-
ESP8266_ARDUINO_HARDWARE: "${{ runner.temp }}/hardware"
104-
ESP8266_ARDUINO_IDE: "${{ runner.temp }}/arduino_ide"
105100
ESP8266_ARDUINO_SKETCHES: "libraries/esp8266/examples/Blink/Blink.ino"
106101
run: |
107102
bash ./tests/build.sh

.github/workflows/build-platformio.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run:
1919
shell: bash
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
submodules: true
2424
- uses: actions/setup-python@v5
@@ -36,4 +36,4 @@ jobs:
3636
ESP8266_ARDUINO_BUILDER: "platformio"
3737
run: |
3838
pip install -U platformio
39-
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | shuf -n 10 -)" bash ./tests/build.sh
39+
env ESP8266_ARDUINO_SKETCHES="$(find libraries/ -name '*.ino' | grep -e libraries/esp8266/examples -e SoftwareSerial)" bash ./tests/build.sh

.github/workflows/check-autogenerated.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run:
1717
shell: bash
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
submodules: false
2222
- run: |
@@ -29,7 +29,7 @@ jobs:
2929
run:
3030
shell: bash
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
with:
3434
submodules: false
3535
- uses: actions/setup-python@v5
@@ -51,7 +51,7 @@ jobs:
5151
run:
5252
shell: bash
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555
with:
5656
submodules: false
5757
- uses: actions/setup-python@v5

.github/workflows/documentation.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ jobs:
1616
run:
1717
shell: bash
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
submodules: true
2222
- uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.x'
2525
- name: Build documentation
2626
run: |
27-
pip install --user -r doc/requirements.txt
28-
bash ./tests/ci/build_docs.sh
27+
pushd doc/
28+
python3 -mvenv _venv
29+
./_venv/bin/pip install -r requirements.txt
30+
env SPHINXBUILD=$(pwd)/_venv/bin/sphinx-build ../tests/ci/build_docs.sh
31+
popd

.github/workflows/release-to-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: Update master JSON file
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4040
with:
4141
submodules: false
4242
fetch-depth: 0

.github/workflows/style-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run:
1818
shell: bash
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
with:
2222
submodules: true
2323
- uses: actions/setup-python@v5
@@ -27,15 +27,15 @@ jobs:
2727
run: |
2828
sudo apt update
2929
python ./tests/test_restyle.py --quiet
30-
bash ./tests/ci/style_check.sh
30+
env CLANG_FORMAT="clang-format-18" bash ./tests/ci/style_check.sh
3131
3232
# Validate orthography
3333

3434
code-spell:
3535
name: codespell
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939
with:
4040
submodules: false
4141
- name: Run codespell

.github/workflows/tag-to-draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
run:
1919
shell: bash
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
submodules: true
2424
fetch-depth: 0

.gitignore

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
.DS_Store
2-
tools/dist/
3-
tools/xtensa-lx106-elf/
4-
tools/mkspiffs/
5-
tools/mklittlefs/
6-
tools/python3/
7-
package/versions/
8-
exclude.txt
92

10-
tests/hosts/lcov/
3+
*.orig
114

12-
*.pyc
135
*.gch
6+
*.pyc
147

15-
boards.local.txt
16-
17-
*.gcov
18-
*.gcno
198
*.gcda
20-
*.o
9+
*.gcno
10+
*.gcov
2111
*.a
12+
*.o
13+
14+
#created by user/scripts
15+
cores/esp8266/CommonHFile.h
16+
tests/host/lcov/
17+
tools/sdk/ld/backup/
18+
*.local.txt
19+
.cache
20+
compile_commands.json
21+
22+
#dist
23+
tools/dist/
24+
tools/mklittlefs/
25+
tools/mkspiffs/
26+
tools/python3/
27+
tools/xtensa-lx106-elf/
28+
package/versions/
29+
exclude.txt
2230

2331
#Ignore files built by Visual Studio/Visual Micro
2432
[Dd]ebug*/

.readthedocs.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
# Set the OS, Python version and other tools you might need
8+
build:
9+
os: ubuntu-24.04
10+
tools:
11+
python: "3.12"
12+
13+
# Build documentation in the "doc/" directory with Sphinx
14+
sphinx:
15+
configuration: doc/conf.py
16+
17+
# Install same versions as our local tools
18+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
19+
python:
20+
install:
21+
- requirements: doc/requirements.txt

0 commit comments

Comments
 (0)