diff --git a/.github/workflows/ci-esp-idf-next.yml b/.github/workflows/ci-esp-idf-next.yml index eb0c47586e3..e0b34bb8ab1 100644 --- a/.github/workflows/ci-esp-idf-next.yml +++ b/.github/workflows/ci-esp-idf-next.yml @@ -25,7 +25,7 @@ jobs: - xtensa-esp32s2-espidf - xtensa-esp32s3-espidf idf-version: - - v5.3.2 + - release/v5.3 - release/v5.4 - master steps: @@ -87,11 +87,10 @@ jobs: chmod a+x $HOME/.cargo/bin/ldproxy - name: Build | Examples - if: matrix.target != 'riscv32imac-esp-espidf' env: ESP_IDF_VERSION: ${{ matrix.idf-version }} ESP_IDF_SDKCONFIG_DEFAULTS: "${{ github.workspace }}/.github/configs/sdkconfig.defaults" - RUSTFLAGS: "${{ !startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }} ${{ '-C default-linker-libraries' }}" + RUSTFLAGS: "${{ !startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}" WIFI_SSID: "ssid" WIFI_PASS: "pass" ESP_DEVICE_IP: "192.168.1.250" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b24c40255fd..32978778fac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,9 +29,7 @@ jobs: - v4.4.8 - v5.1.2 - v5.2.3 -# Commented out until this gets resolved: -# https://github.com/espressif/esp-idf/issues/14174#issuecomment-2558527855 -# - v5.3.2 + - v5.3.2 steps: - name: Setup | Checkout uses: actions/checkout@v3 @@ -91,11 +89,10 @@ jobs: chmod a+x $HOME/.cargo/bin/ldproxy - name: Build | Examples - if: matrix.target != 'riscv32imac-esp-espidf' env: ESP_IDF_VERSION: ${{ matrix.idf-version }} ESP_IDF_SDKCONFIG_DEFAULTS: "${{ github.workspace }}/.github/configs/sdkconfig.defaults" - RUSTFLAGS: "${{ !startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }} ${{ '-C default-linker-libraries' }}" + RUSTFLAGS: "${{ !startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time64' || startsWith(matrix.idf-version, 'v4') && '--cfg espidf_time32' }}" WIFI_SSID: "ssid" WIFI_PASS: "pass" ESP_DEVICE_IP: "192.168.1.250"