Skip to content

Add two-hop WireGuard for iOS #913

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.

Sign up for GitHub

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

Merged
pronebird merged 1 commit into from
Sep 2, 2024
Merged

Add two-hop WireGuard for iOS #913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build-nym-vpn-core-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
CARGO_TERM_COLOR: always
CARGO_TARGET: release
WG_GO_LIB_PATH: ${{ github.workspace }}/lib
WG_GO_LIB_PATH: ${{ github.workspace }}/build/lib/aarch64-linux-android
WG_GO_LIB_NAME: wireguard-go_aarch64-linux-android
UPLOAD_DIR_ANDROID: android_artifacts

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-nym-vpn-core-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ on:
value: ${{ jobs.build-ios.outputs.RUST_VERSION }}

env:
IPHONEOS_DEPLOYMENT_TARGET: 16.0
CARGO_TERM_COLOR: always
CARGO_TARGET: release
WG_GO_LIB_PATH: ${{ github.workspace }}/lib
WG_GO_LIB_NAME: wireguard-go_apple_universal
WG_GO_LIB_PATH: ${{ github.workspace }}/build/lib
WG_GO_LIB_NAME: wireguard-go_ios_universal
UPLOAD_DIR_IOS: ios_artifacts

jobs:
Expand Down Expand Up @@ -61,7 +62,7 @@ jobs:
RUSTFLAGS: "-L ${{ env.WG_GO_LIB_PATH }}"
run: |
cargo swift package -p ios -n NymVpnLib --${{ env.CARGO_TARGET }}
ls -la ../target/release/ || true
ls -la ../target/universal-ios/release/ || true

- name: Get rust version used for build
id: rust-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-nym-vpn-core-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [workflow_dispatch, workflow_call]
env:
CARGO_TERM_COLOR: always
CARGO_TARGET: release
WG_GO_LIB_PATH: ${{ github.workspace }}/lib
WG_GO_LIB_PATH: ${{ github.workspace }}/build/lib/universal-apple-darwin
WG_GO_LIB_NAME: wireguard-go_apple_universal
UPLOAD_DIR_MAC: mac_artifacts

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-nym-vpn-core-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
CARGO_TERM_COLOR: always
CARGO_TARGET: release
LIBS_PATH: '${{ github.workspace }}/lib'
LIBS_PATH: '${{ github.workspace }}/build/lib/x86_64-pc-windows-msvc'
WG_GO_LIB_NAME: wireguard-go_x86_64-pc-windows-msvc
MULLVAD_LIB_NAME: winfw
UPLOAD_DIR_WINDOWS: windows_artifacts
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-wireguard-go-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ jobs:
with:
name: wireguard-go_ios_universal
path: |
build/lib/universal-apple-darwin
build/lib/aarch64-apple-ios
build/lib/aarch64-apple-ios-sim
build/lib/x86_64-apple-ios
retention-days: 10
3 changes: 2 additions & 1 deletion .github/workflows/ci-nym-vpn-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ jobs:
if: contains(matrix.os, 'macos') || contains(matrix.os, 'mac-m1')
working-directory: nym-vpn-core
run: |
cargo build --verbose --target aarch64-apple-ios -p nym-vpn-lib
rustflags="-L ${GITHUB_WORKSPACE}/build/lib/aarch64-apple-ios"
RUSTFLAGS=$rustflags cargo build --verbose --target aarch64-apple-ios -p nym-vpn-lib
Copy link
Contributor

@octol octol Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

General comment not for this PR:
The platform stuff is really reaching a point where we should try to take a step back and rework it. Also I'm kinda think that this part here is the result of building both mac and ios during a single job while splitting them into separate seems likely more appropriate (like how android is separate from linux).

Copy link
Collaborator Author

@pronebird pronebird Sep 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's legit. Let's add a card for this and attack it in a separate PR.


- name: Generate uniffi (Android)
if: contains(matrix.target, 'android')
Expand Down
2 changes: 1 addition & 1 deletion nym-vpn-apple/.swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ line_length:
error: 240

multiline_parameters:
allowsSingleLine: false
allows_single_line: true

nesting:
type_level: 3
Expand Down
4 changes: 2 additions & 2 deletions nym-vpn-apple/MixnetLibrary/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ let package = Package(
),
.binaryTarget(
name: "NymVpnLib",
url: "https://github.com/nymtech/nym-vpn-client/releases/download/nym-vpn-core-v0.1.16/nym-vpn-core-v0.1.16_ios_universal.zip",
checksum: "41a5ecb8b0ab7cc2e6130179863761d12bcc988eda6c269cb00bd01a43449741"
url: "https://github.com/nymtech/nym-vpn-client/releases/download/nym-vpn-core-nightly/nym-vpn-core-v0.1.17-dev_ios_universal.zip",
checksum: "66a830cd46b912df1c11704b487f7a661299ff4583d142770ae04c0ceeaaad5c"
Copy link
Contributor

@octol octol Aug 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break after the next nightly build?

Copy link
Contributor

@rokas-ambrazevicius rokas-ambrazevicius Aug 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break. I believe this is a temp fix to get the Testflight out the door.

Copy link
Contributor

@octol octol Aug 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you need a custom build of the vpn lib that is non-temporary you can use a named tag like nym-vpn-core-ios-testflight. But maybe if we merge this on Monday we can create a new release core then and use that?

Copy link
Contributor

@rokas-ambrazevicius rokas-ambrazevicius Sep 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be ideal 👍

Copy link
Collaborator Author

@pronebird pronebird Sep 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll fix this with a follow up pr

),
.testTarget(
name: "MixnetLibraryTests",
Expand Down
Loading