Skip to content

Commit 40ba34c

Browse files
mcsprmcspr
authored
Merge branch 'master' into master
2 parents 211fab5 + 7e0d20e commit 40ba34c

File tree

110 files changed

+2276
-548
lines changed

Some content is hidden

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

110 files changed

+2276
-548
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@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: true
2323
- run: |
@@ -32,7 +32,7 @@ jobs:
3232
run:
3333
shell: bash
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
with:
3737
submodules: true
3838
- run: |

‎.github/workflows/build-ide.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
run:
1818
shell: bash
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: false
23-
- uses: actions/cache@v3
23+
- uses: actions/cache@v4
2424
with:
2525
path: ./tools/dist
2626
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -39,13 +39,13 @@ jobs:
3939
lwip: ["default", "IPv6"]
4040
chunk: [0, 1, 2, 3, 4, 5, 6, 7]
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
with:
4444
submodules: true
45-
- uses: actions/setup-python@v4
45+
- uses: actions/setup-python@v5
4646
with:
4747
python-version: '3.x'
48-
- uses: actions/cache@v3
48+
- uses: actions/cache@v4
4949
with:
5050
path: ./tools/dist
5151
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -63,13 +63,13 @@ jobs:
6363
name: Windows
6464
runs-on: windows-latest
6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6767
with:
6868
submodules: false
69-
- uses: actions/setup-python@v4
69+
- uses: actions/setup-python@v5
7070
with:
7171
python-version: '3.x'
72-
- uses: actions/cache@v3
72+
- uses: actions/cache@v4
7373
with:
7474
path: ./tools/dist
7575
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -88,13 +88,13 @@ jobs:
8888
run:
8989
shell: bash
9090
steps:
91-
- uses: actions/checkout@v3
91+
- uses: actions/checkout@v4
9292
with:
9393
submodules: false
94-
- uses: actions/setup-python@v4
94+
- uses: actions/setup-python@v5
9595
with:
9696
python-version: '3.x'
97-
- uses: actions/cache@v3
97+
- uses: actions/cache@v4
9898
with:
9999
path: ./tools/dist
100100
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}

‎.github/workflows/build-platformio.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
run:
1919
shell: bash
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
submodules: true
24-
- uses: actions/setup-python@v4
24+
- uses: actions/setup-python@v5
2525
with:
2626
python-version: '3.x'
27-
- uses: actions/cache@v3
27+
- uses: actions/cache@v4
2828
with:
2929
path: |
3030
tools/dist

‎.github/workflows/check-autogenerated.yml

Lines changed: 6 additions & 6 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@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
submodules: false
2222
- run: |
@@ -29,13 +29,13 @@ jobs:
2929
run:
3030
shell: bash
3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
with:
3434
submodules: false
35-
- uses: actions/setup-python@v4
35+
- uses: actions/setup-python@v5
3636
with:
3737
python-version: '3.x'
38-
- uses: actions/cache@v3
38+
- uses: actions/cache@v4
3939
with:
4040
path: ./tools/dist
4141
key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
@@ -51,10 +51,10 @@ jobs:
5151
run:
5252
shell: bash
5353
steps:
54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555
with:
5656
submodules: false
57-
- uses: actions/setup-python@v4
57+
- uses: actions/setup-python@v5
5858
with:
5959
python-version: '3.x'
6060
- name: Check git-diff result

‎.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
run:
1717
shell: bash
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
with:
2121
submodules: true
22-
- uses: actions/setup-python@v4
22+
- uses: actions/setup-python@v5
2323
with:
2424
python-version: '3.x'
2525
- name: Build documentation

‎.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@v3
39+
- uses: actions/checkout@v4
4040
with:
4141
submodules: false
4242
fetch-depth: 0

‎.github/workflows/style-check.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,15 @@ jobs:
1717
run:
1818
shell: bash
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: true
23-
- uses: actions/setup-python@v4
23+
- uses: actions/setup-python@v5
2424
with:
2525
python-version: '3.x'
2626
- name: Style check
27-
env:
28-
LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
2927
run: |
30-
export GNUPGHOME=$(mktemp -d)
31-
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
32-
gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
33-
sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
34-
gpgconf --kill all
35-
rm -r $GNUPGHOME
36-
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | \
37-
sudo tee /etc/apt/sources.list.d/llvm.list
3828
sudo apt update
39-
sudo apt install clang-format-13
40-
pip3 install pyyaml
4129
bash ./tests/ci/style_check.sh
4230
4331
# Validate orthography
@@ -46,7 +34,7 @@ jobs:
4634
name: codespell
4735
runs-on: ubuntu-latest
4836
steps:
49-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
5038
with:
5139
submodules: false
5240
- name: Run codespell

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
run:
1919
shell: bash
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
submodules: true
2424
fetch-depth: 0
25-
- uses: actions/setup-python@v4
25+
- uses: actions/setup-python@v5
2626
with:
2727
python-version: '3.x'
2828
- name: Set GIT tag name

0 commit comments

Comments
 (0)