From d7f5d8412c26551529e8730c479b034ec2c4a991 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 13 Dec 2022 00:11:54 +0100 Subject: [PATCH] ci: Remove duplicate `-p glutin` from `cargo apk --` invocation `cargo-subcommand` doesn't yet deduplicate this and currently doesn't support building multiple packages (even if this would result in building a single package). It's only used once when calling `cargo $CMD test $OPTIONS`, the other invocation is guarded for when the target _is not_ Android anyway. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b5bda3103..b048159905 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,wayland" } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,x11" } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: glx } - - { target: aarch64-linux-android, os: ubuntu-latest, options: -p glutin, cmd: 'apk --' } + - { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' } - { target: x86_64-apple-darwin, os: macos-latest, } # We don't support ios for now. # - { target: x86_64-apple-ios, os: macos-latest, } @@ -94,7 +94,7 @@ jobs: !contains(matrix.platform.target, 'android') && !contains(matrix.platform.target, 'ios') && !contains(matrix.platform.target, 'wasm32')) - run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES + run: cargo test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES - name: Check documentation shell: bash