ci: turn features to array

Analog-Labs · Jul 4, 2024 · ef5abd5 · ef5abd5
1 parent fc0b67d
commit ef5abd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/actions/cargo-command/action.yaml b/.github/actions/cargo-command/action.yaml
@@ -44,23 +44,23 @@ runs:
           ~/.cargo/registry/index/
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
-        key: cargo-cache-${{ inputs.package || 'workspace' }}-${{ inputs.features || 'default' }}-${{ hashFiles('Cargo.lock') }}
+        key: cargo-cache-${{ inputs.package || 'workspace' }}-${{ joint(inputs.features,'_') || 'default' }}-${{ hashFiles('Cargo.lock') }}
         restore-keys: |
-          cargo-cache-${{ inputs.package || 'workspace' }}-${{ inputs.features || 'default' }}-
+          cargo-cache-${{ inputs.package || 'workspace' }}-${{ join(inputs.features,'_') || 'default' }}-
           cargo-cache-${{ inputs.package || 'workspace' }}-default-
           cargo-cache-workspace-
     - name: Cache cargo target folder
       if: ${{ inputs.cache }}
       uses: actions/cache@v4
       with:
         path: target
-        key: cargo-${{ inputs.command }}-${{ inputs.profile }}-${{ inputs.package || 'workspace' }}-${{ inputs.features || 'default' }}-${{ hashFiles('Cargo.lock') }}
+        key: cargo-${{ inputs.command }}-${{ inputs.profile }}-${{ inputs.package || 'workspace' }}-${{ join(inputs.features,'_') || 'default' }}-${{ hashFiles('Cargo.lock') }}
         restore-keys: |
-          cargo-${{ inputs.command }}-${{ inputs.profile }}-${{ inputs.package || 'workspace' }}-${{ inputs.features || 'default' }}-
+          cargo-${{ inputs.command }}-${{ inputs.profile }}-${{ inputs.package || 'workspace' }}-${{ join(inputs.features,'_') || 'default' }}-
           cargo-${{ inputs.command }}-${{ inputs.profile }}-${{ inputs.package || 'workspace' }}-default-
           cargo-${{ inputs.command }}-${{ inputs.profile }}-workspace-
     - name: Run cargo ${{ inputs.command }}
       env:
         CARGO_TERM_COLOR: always
       shell: bash
-      run: cargo ${{ inputs.command }} ${{ inputs.package && '--package' || '--workspace' }} ${{ inputs.package }} --profile '${{ inputs.profile }}' --features '${{ inputs.features }}' ${{ inputs.annotate && '--message-format json' || '' }} ${{ inputs.args }} ${{ inputs.annotate && '| cargo-action-fmt' || '' }}
+      run: cargo ${{ inputs.command }} ${{ inputs.package && '--package' || '--workspace' }} ${{ inputs.package }} --profile '${{ inputs.profile }}' --features '${{ join(inputs.features,',') }}' ${{ inputs.annotate && '--message-format json' || '' }} ${{ inputs.args }} ${{ inputs.annotate && '| cargo-action-fmt' || '' }}
diff --git a/.github/workflows/pr-test-cargo.yaml b/.github/workflows/pr-test-cargo.yaml
@@ -33,12 +33,12 @@ jobs:
         uses: ./.github/actions/cargo-command
         with:
           command: test
-          features: runtime-benchmarks,try-runtime
+          features: [runtime-benchmarks, try-runtime]
           args: --no-run
       - name: Run testsuite
         uses: ./.github/actions/cargo-command
         with:
           command: test
-          features: runtime-benchmarks,try-runtime
+          features: [runtime-benchmarks, try-runtime]
           cache: false
           annotate: false
diff --git a/.github/workflows/pr-test-clippy.yaml b/.github/workflows/pr-test-clippy.yaml
@@ -33,5 +33,5 @@ jobs:
         uses: ./.github/actions/cargo-command
         with:
           command: clippy
-          features: runtime-benchmarks,try-runtime
+          features: [runtime-benchmarks, try-runtime]
           args: --all-targets -- -D warnings