From b575d1602769deaf4408bec75c0fdee4bf915ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Sun, 18 Aug 2024 00:04:26 +0200 Subject: [PATCH] Specify Rust target for iOS --- .github/workflows/ios-rust-ffi.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ios-rust-ffi.yml b/.github/workflows/ios-rust-ffi.yml index cc41fea3a524..d847e688ff95 100644 --- a/.github/workflows/ios-rust-ffi.yml +++ b/.github/workflows/ios-rust-ffi.yml @@ -3,7 +3,7 @@ name: iOS - Build and test Rust FFI (mullvad-ios) on: pull_request: paths: - - .github/workflows/clippy.yml + - .github/workflows/ios-rust-ffi.yml - clippy.toml - '**/*.rs' workflow_dispatch: @@ -17,19 +17,27 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install Rust uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable target: ${{ matrix.target }} + default: true - name: Build and test crates shell: bash env: RUSTFLAGS: --deny warnings + # NOTE: Tests actually target macOS here. This is because we do not have an iOS runner + # handy. run: | source env.sh - time cargo build --locked --verbose --lib -p mullvad-ios + time cargo build --locked --verbose --lib -p mullvad-ios --target ${{ matrix.target }} time cargo test --locked --verbose --lib -p mullvad-ios clippy-check-ios: @@ -41,11 +49,17 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Install Protoc + uses: arduino/setup-protoc@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install Rust uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable target: ${{ matrix.target }} + default: true - name: Clippy check shell: bash @@ -53,5 +67,5 @@ jobs: RUSTFLAGS: --deny warnings run: | source env.sh - time cargo clippy --locked --all-targets --no-default-features -p mullvad-ios - time cargo clippy --locked --all-targets --all-features -p mullvad-ios + time cargo clippy --locked --all-targets --no-default-features -p mullvad-ios --target ${{ matrix.target }} + time cargo clippy --locked --all-targets --all-features -p mullvad-ios --target ${{ matrix.target }}