Merge pull request #22 from boozook/ci/fix-pre-gen-update-features-def

CI: fix features list for pre-build update workflow
boozook · Sep 12, 2023 · de26013 · de26013
2 parents 9020810 + b4efe32
commit de26013
Showing 1 changed file with 24 additions and 27 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -78,7 +78,7 @@ jobs:
           DEFAULT_BRANCH: ${{ github.event.inputs.source || steps.base.outputs.value || github.event.repository.default_branch }}
 
   pre-gen:
-    name: Gen (${{ matrix.os }}, ${{ matrix.features.v }})
+    name: Gen (${{ matrix.os }}, ${{ matrix.features.name }})
     defaults:
       run:
         shell: bash
@@ -92,26 +92,23 @@ jobs:
           - ubuntu-latest
           # - windows-latest
         sdk:
-          # - latest
           - ${{ github.event.inputs.source || 'latest' }}
         features:
-          - {
-              v: --features=bindings-documentation,
-              bindings-derive-debug,
-              name: default,
-            }
-          - {
-              v: --features=bindings-documentation,
-              bindings-derive-default,
-              bindings-derive-eq,
-              bindings-derive-copy,
-              bindings-derive-debug,
-              bindings-derive-hash,
-              bindings-derive-ord,
-              bindings-derive-partialeq,
-              bindings-derive-partialord,
-              name: full,
-            }
+          - v: >-
+              bindings-documentation
+              bindings-derive-debug
+            name: default
+          - v: >-
+              bindings-documentation
+              bindings-derive-default
+              bindings-derive-eq
+              bindings-derive-copy
+              bindings-derive-debug
+              bindings-derive-hash
+              bindings-derive-ord
+              bindings-derive-partialeq
+              bindings-derive-partialord
+            name: full
 
     steps:
       - uses: actions/checkout@v4
@@ -134,14 +131,14 @@ jobs:
 
       - name: Host
         run: |
-          cargo build -p=playdate-sys ${{ matrix.features.v }} -vv
-          cargo build -p=playdate-sys ${{ matrix.features.v }} --release
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" -vv
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" --release
 
       - name: Device
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          cargo build -p=playdate-sys ${{ matrix.features.v }} --target=thumbv7em-none-eabihf
-          cargo build -p=playdate-sys ${{ matrix.features.v }} --target=thumbv7em-none-eabihf --release
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" --target=thumbv7em-none-eabihf
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" --target=thumbv7em-none-eabihf --release
 
       - name: Format
         run: rustfmt api/sys/gen/*.rs
@@ -150,16 +147,16 @@ jobs:
         # env: # uncomment when all bindings for min-supported-SDK will be there
         #   IGNORE_EXISTING_PLAYDATE_SDK: 1
         run: |
-          cargo test -p=playdate-sys ${{ matrix.features.v }}
-          cargo test -p=playdate-sys ${{ matrix.features.v }} --release
+          cargo test -p=playdate-sys --features="${{ matrix.features.v }}"
+          cargo test -p=playdate-sys --features="${{ matrix.features.v }}" --release
 
       - name: Test (device)
         if: ${{ matrix.os == 'ubuntu-latest' }}
         # env: # uncomment when all bindings for min-supported-SDK will be there
         #   IGNORE_EXISTING_PLAYDATE_SDK: 1
         run: |
-          cargo build -p=playdate-sys ${{ matrix.features.v }} --target=thumbv7em-none-eabihf -Zbuild-std=core,alloc
-          cargo build -p=playdate-sys ${{ matrix.features.v }} --target=thumbv7em-none-eabihf -Zbuild-std=core,alloc --release
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" --target=thumbv7em-none-eabihf -Zbuild-std=core,alloc
+          cargo build -p=playdate-sys --features="${{ matrix.features.v }}" --target=thumbv7em-none-eabihf -Zbuild-std=core,alloc --release
 
       - name: Commit
         id: commit