Merge branch 'master' into master

Author: d-a-v

.git-blame-ignore-revs

@@ -0,0 +1,4 @@
+9bdcd4f36a2e5285267b69b17e8fc26482dc1c72
+eea9999dc5eaf464a432f77d5b65269f9baf198d
+98125f88605cd7e46e9be4e1b3ad0600dd5d2b51
+19b7a29720a6f2c95d06e2ea4baa335dcf32e68f

.github/workflows/pull-request.yml

@@ -15,6 +15,9 @@ jobs:
   build-linux:
     name: Build ${{ matrix.chunk }}
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         chunk: [0, 1, 2, 3, 4, 5, 6, 7]
@@ -30,7 +33,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./tools/dist
-        key: key-linux-toolchain
+        key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
     - name: Build Sketches
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
@@ -47,6 +50,9 @@ jobs:
   build-debug-ipv6:
     name: Debug IPv6 ${{ matrix.chunk }}
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     strategy:
       matrix:
         chunk: [0, 1, 2, 3, 4, 5, 6, 7]
@@ -62,7 +68,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./tools/dist
-        key: key-linux-toolchain
+        key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
     - name: Build Sketches
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
@@ -90,7 +96,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./tools/dist
-        key: key-windows-toolchain
+        key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
     - name: Build Sketch
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
@@ -102,14 +108,17 @@ jobs:
       run: |
         # Windows has python3 already installed, but it's called "python".
         # Copy python.exe to the proper name so scripts "just work".
-        copy (get-command python).source (get-command python).source.Replace("python.exe", "python3.exe")
+        try { Get-Command python3 } catch { copy (get-command python).source (get-command python).source.Replace("python.exe", "python3.exe") }
         bash ./tests/build.sh
 
 
 # Single build under macOS to ensure the Mac toolchain is good.
   build-mac:
     name: Mac
     runs-on: macOS-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -122,7 +131,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./tools/dist
-        key: key-mac-toolchain
+        key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
     - name: Build Sketch
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
@@ -139,6 +148,9 @@ jobs:
   build-pio:
     name: Build Platform.IO
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -154,14 +166,18 @@ jobs:
         mod: 42 # Picked at random to give 4-5 builds and exit.
         rem: 13
       run: |
-        sudo apt-get install python3-pip python3-setuptools
+        sudo apt update
+        sudo apt install python3-pip python3-setuptools
         PATH=/home/runner/.local/bin:$PATH bash ./tests/platformio.sh
 
 
 # Run host test suite under valgrind for runtime checking of code.
   host-tests:
     name: Host tests
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -174,14 +190,18 @@ jobs:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
-        sudo apt-get install valgrind lcov
+        sudo apt update
+        sudo apt install valgrind lcov
         bash ./tests/ci/host_test.sh
 
 
 # Ensure Sphinx can build the documentation properly.
   documentation:
     name: Documentation
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -194,7 +214,8 @@ jobs:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
-        sudo apt-get install python3-pip python3-setuptools
+        sudo apt update
+        sudo apt install python3-pip python3-setuptools
         # GitHub CI installs pip3 and setuptools outside the path.
         # Update the path to include them and run.
         PATH=/home/runner/.local/bin:$PATH pip3 install --user -r doc/requirements.txt
@@ -205,6 +226,9 @@ jobs:
   style-check:
     name: Style and formatting
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -214,17 +238,31 @@ jobs:
         python-version: '3.x'
     - name: Style check
       env:
+        LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
-          sudo apt-get install astyle
+          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
 
 
 # Quick test that the mocking builds succeed
   mock-check:
     name: Mock trivial test
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
@@ -244,16 +282,45 @@ jobs:
   boards-check:
     name: Boards.txt check
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
     - uses: actions/setup-python@v2
       with:
         python-version: '3.x'
+    - name: Cache Linux toolchain
+      id: cache-linux
+      uses: actions/cache@v2
+      with:
+        path: ./tools/dist
+        key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
     - name: Boards.txt diff
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
           bash ./tests/ci/build_boards.sh
+          bash ./tests/ci/eboot_test.sh
+          bash ./tests/ci/pkgrefs_test.sh
+
+
+# Validate orthography
+  code-spell:
+    name: Check spelling
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Run codespell
+      uses: codespell-project/actions-codespell@master
+      with:
+        skip: ./libraries/ESP8266SdFat,./libraries/LittleFS/lib,./tools/pyserial,./tools/sdk,./tools/esptool,./libraries/SoftwareSerial,./libraries/Ethernet,./github/workflows,./libraries/ESP8266HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino,./libraries/esp8266/examples/RTCUserMemory/RTCUserMemory.ino,./libraries/esp8266/examples/StreamString/StreamString.ino,./libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino,./libraries/ESP8266WiFi/examples/BearSSL_Sessions/BearSSL_Sessions.ino,./libraries/ESP8266WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino,./libraries/ESP8266WebServer/examples/HttpHashCredAuth/HttpHashCredAuth.ino,./cores/esp8266/spiffs,./tests/device/test_libc/libm_string.c, ./libraries/Netdump/examples/Netdump/Netdump.ino,./libraries/ESP8266WiFi/examples/BearSSL_Server,./cores/esp8266/LwipIntfDev.h
+        ignore_words_list: ESP8266,esp8266,esp,dout,DOUT,ser,ans

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

@@ -32,25 +32,19 @@ jobs:
   package:
     name: Update master JSON file
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
-        submodules: true
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Set GIT tag name
-      run: |
-        echo "::set-env name=TRAVIS_TAG::$(git describe --exact-match --tags)"
+        submodules: false
+        fetch-depth: 0
     - name: Deploy updated JSON
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         BUILD_TYPE: package
         CI_GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
         GHCI_DEPLOY_KEY: ${{ secrets.GHCI_DEPLOY_KEY }}
       run: |
-           bash ./tests/ci/build_package.sh
-           # Only the regenerated JSON file will be used, but it's simpler
-           # than looking for it in a GH release.
            bash ./package/deploy_package_index.sh
-

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

@@ -14,17 +14,22 @@ jobs:
   package:
     name: Package
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
+        fetch-depth: 0
     - uses: actions/setup-python@v2
       with:
         python-version: '3.x'
     - name: Set GIT tag name
       run: |
         # Sets an environment variable used in the next steps
-        echo "::set-env name=TRAVIS_TAG::$(git describe --exact-match --tags)"
+        TRAVIS_TAG="$(git describe --exact-match --tags)"
+        echo "TRAVIS_TAG=${TRAVIS_TAG}" >> $GITHUB_ENV
     - name: Build package JSON
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}

.gitignore

@@ -3,15 +3,9 @@ tools/dist/
 tools/xtensa-lx106-elf/
 tools/mkspiffs/
 tools/mklittlefs/
-tools/python/
 tools/python3/
 package/versions/
 exclude.txt
-tools/sdk/lib/liblwip_src.a
-tools/sdk/lwip/src/build
-tools/sdk/lwip/src/liblwip_src.a
-tools/sdk/ld/backup
-tools/sdk/ld/eagle.app.v6.common.ld
 
 tests/hosts/lcov/
 

.gitmodules

@@ -24,4 +24,4 @@
 	url = https://github.com/arduino-libraries/Ethernet.git
 [submodule "tools/sdk/uzlib"]
 	path = tools/sdk/uzlib
-	url = https://github.com/earlephilhower/uzlib.git
+	url = https://github.com/pfalcon/uzlib.git