Update to new crates; simplify advanced options

.github/workflows/ci_cargo.yml

@@ -2,6 +2,8 @@ name: Cargo CI
 
 on:
   push:
+    branches:
+      - master
     paths:
       - "cargo/**"
       - ".github/workflows/ci_cargo.yml"
@@ -18,95 +20,20 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  cargo-checks-v5:
-    name: "${{ matrix.target }} | ${{ matrix.esp-idf.version }} | std(hal):${{ matrix.std-config.std }}(${{ matrix.std-config.hal }})"
+  checks:
+    name: "${{ matrix.target }} | ${{ matrix.esp-idf.version }} | std=${{ matrix.std-config.std }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        target: ["esp32", "esp32c3", esp32c2, esp32c6, esp32h2, "esp32s2", "esp32s3"]
+        target: ["esp32", "esp32c3", "esp32c2", "esp32c6", "esp32h2", "esp32s2", "esp32s3"]
         std-config:
-          - std: false
-          - std: true
-            hal: "No"
           - std: true
-            hal: "Yes (default features)"
-          - std: true
-            hal: "Yes (all features)"
-        esp-idf:
-          - version: v5.1
-          # - version: master
-          #   name: master
-    steps:
-      - name: Setup | Rust (RISC-V)
-        if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
-        uses: dtolnay/rust-toolchain@v1
-        with:
-          toolchain: nightly
-          components: clippy, rustfmt, rust-src
-      - name: Setup | Rust (Xtensa)
-        if: matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3'
-        uses: esp-rs/[email protected]
-        with:
-          default: true
-          buildtargets: ${{ matrix.target }}
-          ldproxy: false
-          version: "1.69.0"
-      - uses: Swatinem/rust-cache@v2
-      - name: Setup | cargo-generate (binary)
-        id: cargo-generate-binary
-        continue-on-error: true
-        run: |
-          sudo curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1)-x86_64-unknown-linux-gnu.tar.gz" -o "/home/runner/.cargo/bin/cargo-generate.tar.gz"
-          tar xf "/home/runner/.cargo/bin/cargo-generate.tar.gz" -C /home/runner/.cargo/bin
-          chmod u+x /home/runner/.cargo/bin/cargo-generate
-      - name: Setup | cargo-generate (cargo)
-        if: steps.cargo-generate-binary.outcome != 'success'
-        run: cargo install cargo-generate
-      - name: Setup | ldproxy (binary)
-        id: ldproxy-binary
-        continue-on-error: true
-        run: |
-          sudo curl -L "https://github.com/esp-rs/embuild/releases/latest/download/ldproxy-x86_64-unknown-linux-gnu.zip" -o "/home/runner/.cargo/bin/ldproxy.zip"
-          unzip "/home/runner/.cargo/bin/ldproxy.zip" -d "/home/runner/.cargo/bin/"
-          chmod u+x /home/runner/.cargo/bin/ldproxy
-      - name: Setup | ldproxy (cargo)
-        if: steps.ldproxy-binary.outcome != 'success'
-        run: cargo install ldproxy
-      - uses: actions/checkout@v4
-        with:
-          path: /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template
-      - name: Generate (STD)
-        if: matrix.std-config.std == true
-        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 hal="${{ matrix.std-config.hal }}" -d devcontainer=false -d wokwi=false -d ci=false
-      - name: Generate (No STD)
-        if: matrix.std-config.std == false
-        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 (RISC-V)
-        if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
-        run: cd test; cargo fmt -- --check
-      - name: Build | Clippy (RISC-V)
-        if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
-        run: cd test; cargo clippy --no-deps -- -Dwarnings
-      - name: Build | Compile
-        run: cd test; cargo build
-  cargo-checks-v4:
-    name: "${{ matrix.target }} | ${{ matrix.esp-idf.version }} | std(hal):${{ matrix.std-config.std }}(${{ matrix.std-config.hal }})"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target: ["esp32", "esp32c3", "esp32s2", "esp32s3"]
-        std-config:
           - std: false
-          - std: true
-            hal: "No"
-          - std: true
-            hal: "Yes (default features)"
-          - std: true
-            hal: "Yes (all features)"
         esp-idf:
+          - version: v5.1
           - version: v4.4
+          # - version: master
     steps:
       - name: Setup | Rust (RISC-V)
         if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
@@ -121,6 +48,7 @@ jobs:
           default: true
           buildtargets: ${{ matrix.target }}
           ldproxy: false
+          version: "1.71.0"
       - uses: Swatinem/rust-cache@v2
       - name: Setup | cargo-generate (binary)
         id: cargo-generate-binary
@@ -145,21 +73,19 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template
-      - name: Generate (STD)
-        if: matrix.std-config.std == true
-        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 hal="${{ matrix.std-config.hal }}" -d devcontainer=false -d wokwi=false -d ci=false
-      - name: Generate (No STD)
-        if: matrix.std-config.std == false
+      - name: Generate
+        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 (RISC-V)
-        if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
+      - name: Build | Fmt Check
+        if: matrix.esp-idf.version == 'v4.4' && matrix.target == 'esp32c3'
         run: cd test; cargo fmt -- --check
-      - name: Build | Clippy (RISC-V)
-        if: matrix.target != 'esp32' && matrix.target != 'esp32s2' && matrix.target != 'esp32s3'
+      - name: Build | Clippy
+        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.version != 'v4.4' || matrix.target == 'esp32' || matrix.target == 'esp32s2' || matrix.target == 'esp32s3' || matrix.target == 'esp32c3'
         run: cd test; cargo build
-  container-check:
+  container-checks:
     name: "Container Check: ${{ matrix.target }}"
     runs-on: ubuntu-latest
     strategy:
@@ -183,8 +109,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template
-      - name: Generate Project
-        run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cargo --name test-${{ matrix.target }} --vcs none --silent -d mcu=${{ matrix.target }} -d espidfver=v4.4 -d advanced=true -d std=true  -d hal="Yes (default features)" -d devcontainer=true -d wokwi=false -d ci=false
+      - name: Generate
+        run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cargo --name test-${{ matrix.target }} --vcs none --silent -d mcu=${{ matrix.target }} -d advanced=true -d espidfver=v5.1 -d std=true -d devcontainer=true -d wokwi=false -d ci=false
       - name: Update ownership
         run: |
           sudo chown 1000:1000 -R test-${{ matrix.target }}

.github/workflows/ci_cmake.yml

@@ -2,6 +2,8 @@ name: CMake CI
 
 on:
   push:
+    branches:
+      - master
     paths:
       - "cmake/**"
       - ".github/workflows/ci_cmake.yml"
@@ -19,47 +21,52 @@ env:
 
 jobs:
   cmake-checks:
-    name: "${{ matrix.target.board }} | ${{ matrix.esp-idf.version }} | std(hal):${{ matrix.std-config.std }}(${{ matrix.std-config.hal }}))"
+    name: "${{ matrix.target.mcu }} | ${{ matrix.esp-idf.version }} | hal=${{ matrix.std-config.hal }} | std=${{ matrix.std-config.std }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         target:
-          - board: "esp32"
+          - mcu: "esp32"
             toolchain: "esp"
-          - board: "esp32s2"
+          - mcu: "esp32s2"
             toolchain: "esp"
-          - board: "esp32s3"
+          - mcu: "esp32s3"
             toolchain: "esp"
-          - board: "esp32c3"
+          - mcu: "esp32c3"
+            toolchain: "nightly"
+          - mcu: "esp32c2"
+            toolchain: "nightly"
+          - mcu: "esp32c6"
+            toolchain: "nightly"
+          - mcu: "esp32h2"
             toolchain: "nightly"
         std-config:
-          - std: false
-          - std: true
-            hal: "No"
-          - std: true
-            hal: "Yes (default features)"
-          - std: true
-            hal: "Yes (all features)"
+          - hal: true
+            std: true
+          - hal: true
+            std: false
+          - hal: false
+            std: false
         esp-idf:
           - version: v5.1
           # - version: master
           #   name: master
     steps:
       - name: Setup | Rust (RISC-V)
-        if: matrix.target.board != 'esp32' && matrix.target.board != 'esp32s2' && matrix.target.board != 'esp32s3'
+        if: matrix.target.mcu != 'esp32' && matrix.target.mcu != 'esp32s2' && matrix.target.mcu != 'esp32s3'
         uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: nightly
           components: clippy, rustfmt, rust-src
       - name: Setup | Rust (Xtensa)
-        if: matrix.target.board == 'esp32' || matrix.target.board == 'esp32s2' || matrix.target.board == 'esp32s3'
+        if: matrix.target.mcu == 'esp32' || matrix.target.mcu == 'esp32s2' || matrix.target.mcu == 'esp32s3'
         uses: esp-rs/[email protected]
         with:
           default: true
-          buildtargets: ${{ matrix.target.board }}
+          buildtargets: ${{ matrix.target.mcu }}
           ldproxy: false
-          version: "1.69.0"
+          version: "1.71.0"
       - uses: Swatinem/rust-cache@v2
       - name: Setup | cargo-generate (binary)
         id: cargo-generate-binary
@@ -84,18 +91,13 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template
-      - name: Generate (STD)
-        if: matrix.std-config.std == true
-        run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cmake --name test --vcs none --silent -d toolchain=${{ matrix.target.toolchain }} -d std=${{ matrix.std-config.std }} -d espidfver=${{ matrix.esp-idf.version }} -d hal="${{ matrix.std-config.hal }}"
-      - name: Generate (No STD)
-        if: matrix.std-config.std == false
-        run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cmake --name test --vcs none --silent -d toolchain=${{ matrix.target.toolchain }} -d std=${{ matrix.std-config.std }} -d espidfver=${{ matrix.esp-idf.version }}
+      - name: Generate
+        run: cargo generate --path /home/runner/work/esp-idf-template/esp-idf-template/github-esp-idf-template cmake --name test --vcs none --silent -d toolchain=${{ matrix.target.toolchain }} -d advanced=true -d hal=${{ matrix.std-config.hal }} -d std=${{ matrix.std-config.std }} -d espidfver=${{ matrix.esp-idf.version }}
       - name: ESP-IDF | Checkout
         run: git clone https://github.com/espressif/esp-idf; git -C esp-idf checkout ${{ matrix.esp-idf.version }}
       - name: ESP-IDF | Install Tooling
         run: esp-idf/install.sh
       - name: Build | Set Target
-        run: . esp-idf/export.sh; cd test; idf.py set-target ${{ matrix.target.board }}
+        run: . esp-idf/export.sh; cd test; idf.py set-target ${{ matrix.target.mcu }}
       - name: Build | Compile
         run: . esp-idf/export.sh; cd test; idf.py build
-