From a5989741ada3021c7e232fddc5ee792012864b01 Mon Sep 17 00:00:00 2001 From: ivmarkov Date: Tue, 17 Oct 2023 15:46:51 +0300 Subject: [PATCH] Fix typo causing v4.4 to miscompile --- .github/workflows/ci_cargo.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cargo.yml b/.github/workflows/ci_cargo.yml index 434bc54..85cce2d 100644 --- a/.github/workflows/ci_cargo.yml +++ b/.github/workflows/ci_cargo.yml @@ -72,16 +72,16 @@ jobs: with: path: /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template - name: Generate - if: matrix.esp-idf != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' + if: matrix.esp-idf.version != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cargo --name test --vcs none --silent -d mcu=${{ matrix.target }} -d advanced=true -d espidfver=${{ matrix.esp-idf.version }} -d std=${{ matrix.std-config.std }} -d devcontainer=false -d wokwi=false -d ci=false - name: Build | Fmt Check - if: matrix.esp-idf == 'v5.1' && matrix.target == 'esp32c3' + if: matrix.esp-idf.version == 'v4.4' && matrix.target == 'esp32c3' run: cd test; cargo fmt -- --check - name: Build | Clippy - if: matrix.esp-idf != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' + if: matrix.esp-idf.version != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' run: cd test; cargo clippy --no-deps -- -Dwarnings - name: Build | Compile - if: matrix.esp-idf != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' + if: matrix.esp-idf.version != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3' run: cd test; cargo build container-checks: name: "Container Check: ${{ matrix.target }}"