Merge branch 'wireguard-apple-submodule-addendum'lce-dns-temp-branch-android

8 files changed, 28 insertions, 5 deletions

diff --git a/.github/workflows/ios-end-to-end-tests.yml b/.github/workflows/ios-end-to-end-tests.yml
index 8b3fe83970..496b8bb58c 100644
--- a/.github/workflows/ios-end-to-end-tests.yml
+++ b/.github/workflows/ios-end-to-end-tests.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init ios/wireguard-apple
+          git submodule update --init --recursive ios/wireguard-apple
 
       - name: Configure Rust
         run: rustup target add aarch64-apple-ios
diff --git a/.github/workflows/ios-rust-ffi.yml b/.github/workflows/ios-rust-ffi.yml
index bc289a03f9..98fb89a929 100644
--- a/.github/workflows/ios-rust-ffi.yml
+++ b/.github/workflows/ios-rust-ffi.yml
@@ -20,10 +20,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Checkout wireguard-go-rs
+      - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init wireguard-go-rs
+          git submodule update --init --recursive ios/wireguard-apple
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml
index e842b08c1f..289d0278e5 100644
--- a/.github/workflows/ios-screenshots-creation.yml
+++ b/.github/workflows/ios-screenshots-creation.yml
@@ -23,6 +23,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Checkout submodules
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive ios/wireguard-apple
+
       - name: Setup go-lang
         uses: actions/setup-go@v3
         with:
diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml
index 93084a8b14..b3816cc7ec 100644
--- a/.github/workflows/ios-screenshots-tests.yml
+++ b/.github/workflows/ios-screenshots-tests.yml
@@ -27,6 +27,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Checkout submodules
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive ios/wireguard-apple
+
       - name: Configure cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml
index fc0f6a7b86..c73a66d13b 100644
--- a/.github/workflows/ios-validate-build-schemas.yml
+++ b/.github/workflows/ios-validate-build-schemas.yml
@@ -28,6 +28,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Checkout submodules
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive ios/wireguard-apple
+
       - name: Configure cache
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 46a833160b..9c0bbc6f01 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Checkout submodules
         run: |
           git config --global --add safe.directory '*'
-          git submodule update --init ios/wireguard-apple
+          git submodule update --init --recursive ios/wireguard-apple
 
 
       - name: Configure cache
diff --git a/ios/.swiftformat b/ios/.swiftformat
index 7c599d7ee0..d6c663b36e 100644
--- a/ios/.swiftformat
+++ b/ios/.swiftformat
@@ -1,5 +1,5 @@
 # file options
---exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift, PacketTunnelCore/Daita/Maybenot.swift
+--exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift, PacketTunnelCore/Daita/Maybenot.swift, wireguard-apple
 
 # general options
 --swiftversion 5.8
diff --git a/ios/BuildInstructions.md b/ios/BuildInstructions.md
index 2ba1cf9e9b..f9bb84a00a 100644
--- a/ios/BuildInstructions.md
+++ b/ios/BuildInstructions.md
@@ -29,6 +29,14 @@ A protobuf compiler is also required in order to build some of the rust dependen
 brew install protobuf
 ```
 
+## Submodules
+
+The iOS app imports Mullvad's version of `wireguard-go` as a Git submodule. Before building, this must be checked out with
+
+```bash
+git submodule update --init --recursive ios/wireguard-apple
+```
+
 ## Configure Xcode project
 
 Copy template files of Xcode build configuration: