From b4efe32c03c65c860afee489d579f151863439de Mon Sep 17 00:00:00 2001 From: Alexander Koz Date: Tue, 12 Sep 2023 16:13:40 +0400 Subject: [PATCH] CI: fix features list for pre-build update workflow --- .github/workflows/update.yml | 51 +++++++++++++++++------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 3e902a7c..576d85db 100644 --- 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