Merge branch 'master' into sdf222

esp8266 · Apr 18, 2024 · c0b3d99 · c0b3d99
2 parents 94db7e4 + 685f2c9
commit c0b3d99
Show file tree

Hide file tree

Showing 90 changed files with 1,387 additions and 454 deletions.
diff --git a/.github/workflows/build-ide.yml b/.github/workflows/build-ide.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: false
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ./tools/dist
         key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -42,10 +42,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ./tools/dist
         key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -66,10 +66,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: false
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ./tools/dist
         key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}
@@ -91,10 +91,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: false
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ./tools/dist
         key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh', 'tests/build.sh') }}

diff --git a/.github/workflows/build-platformio.yml b/.github/workflows/build-platformio.yml
@@ -21,10 +21,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           tools/dist

diff --git a/.github/workflows/check-autogenerated.yml b/.github/workflows/check-autogenerated.yml
@@ -32,10 +32,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: false
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ./tools/dist
         key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: false
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Check git-diff result

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Build documentation

diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml
@@ -20,24 +20,12 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Style check
-      env:
-        LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
       run: |
-          export GNUPGHOME=$(mktemp -d)
-          gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
-          gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
-            sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
-          gpgconf --kill all
-          rm -r $GNUPGHOME
-          echo "deb http://apt.llvm.org/focal/     llvm-toolchain-focal-13   main" | \
-            sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt update
-          sudo apt install clang-format-13
-          pip3 install pyyaml
           bash ./tests/ci/style_check.sh
 
   # Validate orthography

diff --git a/.github/workflows/tag-to-draft-release.yml b/.github/workflows/tag-to-draft-release.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         submodules: true
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Set GIT tag name