CI: simplify matrix for Eth variants

quartiq · Sep 28, 2021 · 38fa6f4 · 38fa6f4
1 parent 427a4a8
commit 38fa6f4
Showing 1 changed file with 8 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,12 +50,7 @@ jobs:
         toolchain:
           - stable
           - beta
-        variant: [w5500, enc424j600]
-        include:
-          - variant: w5500
-            variant-args: phy_w5500
-          - variant: enc424j600
-            variant-args: phy_enc424j600
+        variant: [phy_w5500, phy_enc424j600]
     steps:
       - uses: actions/checkout@v2
 
@@ -83,27 +78,27 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --no-default-features --features "${{ matrix.variant-args }}"
+          args: --no-default-features --features "${{ matrix.variant }}"
 
       - name: Build [Release]
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --no-default-features --features "${{ matrix.variant-args }}"
+          args: --release --no-default-features --features "${{ matrix.variant }}"
 
       - name: Generate Release
         uses: actions-rs/cargo@v1
         with:
           command: objcopy
-          args: --release --no-default-features --features "${{ matrix.variant-args }}" --verbose -- -O binary booster-release.bin
+          args: --release --no-default-features --features "${{ matrix.variant }}" --verbose -- -O binary booster-release.bin
 
       - name: Upload Release
         uses: actions/upload-artifact@v2
         if: ${{ matrix.toolchain == 'stable' }} &&
             (${{ github.ref == 'refs/heads/master' }} ||
              ${{ github.ref == 'refs/heads/develop' }})
         with:
-          name: Firmware Images (${{ matrix.variant }})
+          name: Firmware Images (variant=${{ matrix.variant }})
           path: |
             target/*/release/booster
             booster-release.bin
@@ -112,12 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        variant: [w5500, enc424j600]
-        include:
-          - variant: w5500
-            variant-args: phy_w5500
-          - variant: enc424j600
-            variant-args: phy_enc424j600
+        variant: [phy_w5500, phy_enc424j600]
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust Nightly
@@ -130,9 +120,9 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --no-default-features --features "unstable ${{ matrix.variant-args }}"
+          args: --no-default-features --features "unstable ${{ matrix.variant }}"
       - name: cargo build+release+unstable
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --no-default-features --features "unstable ${{ matrix.variant-args }}"
+          args: --release --no-default-features --features "unstable ${{ matrix.variant }}"