fix for nodej12 deprecation warning

Author: tobozo

.github/workflows/gen-test-suite.yml

@@ -111,11 +111,12 @@ jobs:
     # Avoid multiline: flatten JSON
     - id: set-env
       run: |
-        content='${{ toJson(env) }}'
-        content="${content//'%'/'%25'}"
-        content="${content//$'\n'/'%0A'}"
-        content="${content//$'\r'/'%0D'}"
-        echo "::set-output name=env::$content"
+        content='${{ toJson(env) }}'    # convert env vars to json
+        content="${content//'%'/'%25'}" # escape percent entities
+        content="${content//$'\n'/''}"  # remove lf
+        content="${content//$'\r'/''}"  # remove cr
+        echo "env=${content}" >> $GITHUB_OUTPUT
+
 
 
   gen_keys:
@@ -165,7 +166,7 @@ jobs:
         cat $pub_key_h_path
 
     - name: Upload RootCA/PubKey as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Certs
         path: |
@@ -197,7 +198,7 @@ jobs:
     steps:
 
     - name: Checkout Current
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
 
@@ -223,14 +224,14 @@ jobs:
         cp ${{env.cert_path}}/pub_key.h $pub_key_c_path
 
     - name: Checkout esp32-flashz
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: vortigont/esp32-flashz
         ref: main
         path: CustomflashZ # must contain string "Custom"
 
     - name: Checkout ESP32-targz
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: tobozo/ESP32-targz
         ref: master
@@ -297,7 +298,7 @@ jobs:
         cat firmware.sign ${{env.littlefs_bin_path}} > ${{env.littlefs_signed_bin_path}}
 
     - name: Update TestSuite artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: TestSuite
         path: |
@@ -315,7 +316,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
 
@@ -334,14 +335,14 @@ jobs:
         # rm ${{env.privkey_path}}
 
     - name: Update TestSuite artifacts with new JSON Manifest
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: TestSuite
         path: |
           ${{env.artifact_path}}/**
 
     - name: Delete Cert/Signature/Privkey artifact
-      uses: geekyeggo/delete-artifact@v1
+      uses: geekyeggo/delete-artifact@v2
       with:
         name: Certs
 

.github/workflows/platformio.yml

@@ -26,9 +26,9 @@ jobs:
       matrix:
         python-version: [3.7]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -51,7 +51,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: arduino/arduino-lint-action@v1
         with:
           project-type: library

src/esp32FOTA.cpp

@@ -299,7 +299,7 @@ bool esp32FOTA::setupHTTP( const char* url )
     const char* rootcastr = nullptr;
     _http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
 
-    log_i("Connecting to: %s\r\n", url );
+    log_i("Connecting to: %s", url );
     if( String(url).startsWith("https") ) {
         if (!_cfg.unsafe) {
             if( !_cfg.root_ca ) {
@@ -719,7 +719,6 @@ bool esp32FOTA::execHTTPcheck()
     }
 
     log_i("Getting HTTP: %s", useURL.c_str());
-    log_i("------");
 
     if(! setupHTTP( useURL.c_str() ) ) {
       log_e("Unable to setup http, aborting!");
@@ -869,8 +868,8 @@ static int64_t getHTTPStream( esp32FOTA* fota, int partition )
         updateSize = fota->getHTTPCLient()->getSize();
         contentType = fota->getHTTPCLient()->header( "Content-type" );
         String acceptRange = fota->getHTTPCLient()->header( "Accept-Ranges" );
-        if( !acceptRange.isEmpty() ) {
-            Serial.printf("This server supports resume! Accept-Ranges: %s\n", acceptRange.c_str() );
+        if( acceptRange == "bytes" ) {
+            Serial.println("This server supports resume!" );
         } else {
             Serial.println("This server does not support resume!" );
         }