diff --git a/.cargo/config.toml b/.cargo/config.toml index 197f5b94d..7cb1f991b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -24,7 +24,7 @@ rustflags = ["--cfg", "espidf_time64"] [env] ESP_IDF_SDKCONFIG_DEFAULTS = ".github/configs/sdkconfig.defaults" -ESP_IDF_VERSION = "v5.1.2" +ESP_IDF_VERSION = "v5.3.2" [unstable] build-std = ["std", "panic_abort"] diff --git a/.github/workflows/ci-esp-idf-next.yml b/.github/workflows/ci-esp-idf-next.yml index 17a7f3ee3..b51d06511 100644 --- a/.github/workflows/ci-esp-idf-next.yml +++ b/.github/workflows/ci-esp-idf-next.yml @@ -87,10 +87,8 @@ 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: "${{ matrix.idf-version != 'release/v4.4' && '--cfg espidf_time64' || matrix.idf-version == 'release/v4.4' && '--cfg espidf_time32' }} ${{ matrix.target == 'riscv32imc-esp-espidf' && '-C default-linker-libraries' || ''}}" RUSTFLAGS: "${{ matrix.idf-version != 'release/v4.4' && '--cfg espidf_time64' || matrix.idf-version == 'release/v4.4' && '--cfg espidf_time32' }}" run: cargo build --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3123c8782..316993aaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: idf-version: - release/v4.4 - release/v5.2 + - v5.3.2 # Commented out until this gets resolved: # https://github.com/espressif/esp-idf/issues/14174#issuecomment-2558527855 # - release/v5.3 @@ -91,9 +92,8 @@ 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: "${{ matrix.idf-version != 'release/v4.4' && '--cfg espidf_time64' || matrix.idf-version == 'release/v4.4' && '--cfg espidf_time32' }} ${{ matrix.target == 'riscv32imc-esp-espidf' && '-C default-linker-libraries' || ''}}" + RUSTFLAGS: "${{ matrix.idf-version != 'release/v4.4' && '--cfg espidf_time64' || matrix.idf-version == 'release/v4.4' && '--cfg espidf_time32' }}" run: cargo build --examples --target ${{ matrix.target }} -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort