Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CI job for mullvad-ios #6635

Merged
merged 2 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions .github/workflows/ios-rust-ffi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
name: iOS - Build and test Rust FFI (mullvad-ios)
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
4 changes: 2 additions & 2 deletions mullvad-ios/src/tunnel_obfuscator_proxy/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{io, net::SocketAddr};
use tokio::task::JoinHandle;
use tunnel_obfuscation::{create_obfuscator, Settings as ObfuscationSettings, Udp2TcpSettings};
use tunnel_obfuscation::{create_obfuscator, udp2tcp::Settings, Settings as ObfuscationSettings};

mod ffi;

Expand All @@ -12,7 +12,7 @@ pub struct TunnelObfuscatorRuntime {

impl TunnelObfuscatorRuntime {
pub fn new(peer: SocketAddr) -> io::Result<Self> {
let settings = ObfuscationSettings::Udp2Tcp(Udp2TcpSettings { peer });
let settings = ObfuscationSettings::Udp2Tcp(Settings { peer });

Ok(Self { settings })
}
Expand Down
Loading