Merge pull request #378 from espressif/bugfix/various_pipeline_fixes

various build fixes
espressif · Sep 18, 2024 · 43e2413 · 43e2413
2 parents 69f62e1 + 83ac6d6
commit 43e2413
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 137 deletions.
diff --git a/.github/workflows/build_and_run_examples.yml b/.github/workflows/build_and_run_examples.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Build Examples
@@ -30,9 +30,9 @@ jobs:
           export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
           idf-build-apps find --config sdkconfig.ci
           idf-build-apps build --ignore-warning-file .ignore_build_warnings.txt --config sdkconfig.ci --parallel-index ${{ matrix.parallel_index }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: example_binaries_${{ matrix.idf_ver }}
+          name: example_binaries_${{ matrix.idf_ver }}_${{ matrix.parallel_index }}
           path: |
             */examples/*/build_esp*/bootloader/bootloader.bin
             */examples/*/build_esp*/partition_table/partition-table.bin
@@ -50,16 +50,15 @@ jobs:
         idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
         idf_target: ["esp32"]
     runs-on: [self-hosted, linux, docker, "${{ matrix.idf_target }}"]
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     container:
-      image: python:3.7-buster
+      image: python:3.11-bookworm
       options: --privileged # Privileged mode has access to serial ports
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: example_binaries_${{ matrix.idf_ver }}
+          pattern: example_binaries_${{ matrix.idf_ver }}_*
+          merge-multiple: true
       - name: Install Python packages
         env:
           PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi/"
@@ -81,16 +80,15 @@ jobs:
         idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
         idf_target: ["esp32"]
     runs-on: [self-hosted, ESP32-ETHERNET-KIT]
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     container:
-      image: python:3.7-buster
+      image: python:3.11-bookworm
       options: --privileged # Privileged mode has access to serial ports
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: example_binaries_${{ matrix.idf_ver }}
+          pattern: example_binaries_${{ matrix.idf_ver }}_*
+          merge-multiple: true
       - name: Install Python packages
         env:
           PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi/"

diff --git a/.github/workflows/build_and_run_test_app.yml b/.github/workflows/build_and_run_test_app.yml
@@ -31,7 +31,7 @@ jobs:
           export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
           export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
           idf.py build
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: test_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
           path: |
@@ -41,27 +41,6 @@ jobs:
             test_app/build/idf_extra_test_app.elf
             test_app/build/flasher_args.json
 
-  # Keeping this here for future reference. QEMU tests are not passing now
-  #run-qemu:
-  #  name: Run Test App in QEMU
-  #  needs: build
-  #  strategy:
-  #    matrix:
-  #      idf_ver: ["release-v4.4", "latest"] #FIXME: QEMU is crashing with v4.3 build
-  #  runs-on: ubuntu-20.04
-  #  container: ageon/pytest_env
-  #  steps:
-  #    - uses: actions/checkout@v2
-  #      with:
-  #        fetch-depth: 0
-  #    - uses: actions/download-artifact@v2
-  #      with:
-  #        name: test_app_bin_esp32_${{ matrix.idf_ver }}
-  #        path: test_app/build
-  #    - name: Run Test App in QEMU
-  #      working-directory: test_app
-  #      run: pytest -s --junit-xml=./test_app_results.xml --embedded-services qemu
-
   run-target:
     name: Run Test App on target
     if: ${{ github.repository_owner == 'espressif' }}
@@ -72,14 +51,12 @@ jobs:
         idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "latest"]
         idf_target: ["esp32", "esp32c3", "esp32s3"]
     runs-on: [self-hosted, linux, docker, "${{ matrix.idf_target }}"]
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     container:
-      image: python:3.7-buster
+      image: python:3.11-bookworm
       options: --privileged # Privileged mode has access to serial ports
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           name: test_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
           path: test_app/build
@@ -90,7 +67,7 @@ jobs:
       - name: Run Test App on target
         working-directory: test_app
         run: pytest --junit-xml=./test_app_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --target=${{ matrix.idf_target }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test_app_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
@@ -103,7 +80,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Download Test results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: test_results
       - name: Publish Test Results

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     container: espressif/idf:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
       - name: Install esp-clang
@@ -41,7 +41,7 @@ jobs:
           export PATH=$PWD:$PATH
           ./clang-tidy-sarif -o results.sarif.raw warnings.txt
           python3 $GITHUB_WORKSPACE/.github/filter_sarif.py -o results.sarif --include-prefix ${GITHUB_WORKSPACE}/ results.sarif.raw
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: |
             warnings.txt

diff --git a/.github/workflows/issue_comment.yml b/.github/workflows/issue_comment.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'espressif' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Sync issue comments to JIRA
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

diff --git a/.github/workflows/new_issues.yml b/.github/workflows/new_issues.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'espressif' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Sync GitHub issues to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         env:

diff --git a/.github/workflows/new_prs.yml b/.github/workflows/new_prs.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'espressif' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Sync PRs to Jira project
         uses: espressif/github-actions/sync_issues_to_jira@master
         with:

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -8,6 +8,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v2
     - uses: pre-commit/[email protected]
diff --git a/.github/workflows/test_sbom.yml b/.github/workflows/test_sbom.yml
@@ -9,7 +9,7 @@ jobs:
     name: Run SBOM manifests validation test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           git config --global safe.directory $(pwd)
           pip install esp-idf-sbom

diff --git a/.github/workflows/upload_component.yml b/.github/workflows/upload_component.yml
@@ -14,7 +14,7 @@ jobs:
   upload_components:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
       - run: |

diff --git a/coap/idf_component.yml b/coap/idf_component.yml
@@ -1,4 +1,4 @@
-version: "4.3.5"
+version: "4.3.5~1"
 description: Constrained Application Protocol (CoAP) C Library
 url: https://github.com/espressif/idf-extra-components/tree/master/coap
 dependencies:

diff --git a/coap/port/include/coap_config_posix.h b/coap/port/include/coap_config_posix.h
@@ -23,6 +23,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <net/if.h>
+#include "lwip/init.h"
 
 #define HAVE_SYS_SOCKET_H
 #define HAVE_MALLOC
@@ -40,10 +41,13 @@ struct in6_pktinfo {
     struct in6_addr ipi6_addr;        /* src/dst IPv6 address */
     unsigned int ipi6_ifindex;        /* send/recv interface index */
 };
+
+#if LWIP_VERSION < 0x02020000
 #define IN6_IS_ADDR_V4MAPPED(a) \
         ((((__const uint32_t *) (a))[0] == 0)                                 \
          && (((__const uint32_t *) (a))[1] == 0)                              \
          && (((__const uint32_t *) (a))[2] == htonl (0xffff)))
+#endif // LWIP_VERSION < 0x02020000
 
 /* As not defined, just need to define is as something innocuous */
 #define IPV6_PKTINFO IPV6_CHECKSUM

diff --git a/spi_nand_flash/idf_component.yml b/spi_nand_flash/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.3.0"
+version: "0.3.1"
 description: Driver for accessing SPI NAND Flash
 url: https://github.com/espressif/idf-extra-components/tree/master/spi_nand_flash
 issues: https://github.com/espressif/idf-extra-components/issues

diff --git a/spi_nand_flash/src/nand.c b/spi_nand_flash/src/nand.c
@@ -203,7 +203,7 @@ esp_err_t spi_nand_flash_init_device(spi_nand_flash_config_t *config, spi_nand_f
         config->gc_factor = 45;
     }
 
-    *handle = calloc(sizeof(spi_nand_flash_device_t), 1);
+    *handle = calloc(1, sizeof(spi_nand_flash_device_t));
     if (*handle == NULL) {
         return ESP_ERR_NO_MEM;
     }