From 03bdd6d2492e88442697c1b68b99bc3ad385fe7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Fri, 16 Aug 2024 14:35:13 +0200
Subject: [PATCH] fixup: workflow for ios ffi

---
 .github/workflows/daemon.yml       | 20 -----------
 .github/workflows/ios-rust-ffi.yml | 57 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 .github/workflows/ios-rust-ffi.yml

diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index c6f5429c2fdf..723d32c48752 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -175,23 +175,3 @@ jobs:
           # doesn't run out of space on the D drive.
           CARGO_TARGET_DIR: "C:/cargo-target"
         run: ./ci/check-rust.sh
-
-  build-ios-ffi:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        target: [aarch64-apple-ios, aarch64-apple-ios-sim]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1.0.6
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-
-      - name: Build and test crates
-        run: |
-          source env.sh
-          cargo build --locked --verbose --lib -p mullvad-ios
diff --git a/.github/workflows/ios-rust-ffi.yml b/.github/workflows/ios-rust-ffi.yml
new file mode 100644
index 000000000000..e63f197d88e5
--- /dev/null
+++ b/.github/workflows/ios-rust-ffi.yml
@@ -0,0 +1,57 @@
+---
+name: iOS - compile Rust FFI
+on:
+  pull_request:
+    paths:
+      - .github/workflows/clippy.yml
+      - clippy.toml
+      - '**/*.rs'
+  workflow_dispatch:
+jobs:
+  build-ios:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        target: [aarch64-apple-ios, aarch64-apple-ios-sim]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1.0.6
+        with:
+          toolchain: stable
+          target: ${{ matrix.target }}
+
+      - name: Build and test crates
+        shell: bash
+        env:
+          RUSTFLAGS: --deny warnings
+        run: |
+          source env.sh
+          time cargo build --locked --verbose --lib -p mullvad-ios
+          time cargo test --locked --verbose --lib -p mullvad-ios
+
+  clippy-check-ios:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        target: [aarch64-apple-ios, aarch64-apple-ios-sim]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1.0.6
+        with:
+          toolchain: stable
+          target: ${{ matrix.target }}
+
+      - name: Clippy check
+        shell: bash
+        env:
+          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