diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml index a8789a2be75b..cc02a352124f 100644 --- a/.github/workflows/ios-screenshots-creation.yml +++ b/.github/workflows/ios-screenshots-creation.yml @@ -19,7 +19,7 @@ jobs: - name: Setup go-lang uses: actions/setup-go@v3 with: - go-version: 1.19.5 + go-version: 1.20.14 - name: Set up yeetd to workaround XCode being slow in CI run: | diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index 04119fdc13fb..2c6b7341f0dd 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -35,7 +35,7 @@ jobs: - name: Setup go-lang uses: actions/setup-go@v3 with: - go-version: 1.19.5 + go-version: 1.20.14 - name: Set up yeetd to workaround XCode being slow in CI run: | diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index 618a82c1e7e8..551cea16f32b 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -36,7 +36,7 @@ jobs: - name: Setup go-lang uses: actions/setup-go@v3 with: - go-version: 1.19.5 + go-version: 1.20.14 - name: Set up yeetd to workaround XCode being slow in CI run: | diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index e1ab5c4b7449..b2f733fea38d 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -62,7 +62,7 @@ jobs: - name: Setup go-lang uses: actions/setup-go@v3 with: - go-version: 1.19.5 + go-version: 1.20.14 - name: Set up yeetd to workaround XCode being slow in CI run: | diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 2e683686dab7..e4b9a2a532f4 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -9111,7 +9111,7 @@ repositoryURL = "https://github.com/mullvad/wireguard-apple.git"; requirement = { kind = revision; - revision = 15242e1698fc45261285d7417ed2cd5130d7332e; + revision = 5f24cdf1aa7fc1802f1695473aab95b4451e4ba0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 929180afa433..e169091f3c2b 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mullvad/wireguard-apple.git", "state" : { - "revision" : "15242e1698fc45261285d7417ed2cd5130d7332e" + "revision" : "5f24cdf1aa7fc1802f1695473aab95b4451e4ba0" } } ], diff --git a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift index 6a88af373d0b..69806809d491 100644 --- a/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift +++ b/ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift @@ -35,6 +35,8 @@ extension WireGuardAdapterError: LocalizedError { case let .startWireGuardBackend(code): return "Failure to start WireGuard backend (error code: \(code))." + case .noInterfaceIp: + return "Interface has no IP address specified." } } } diff --git a/ios/build-wireguard-go.sh b/ios/build-wireguard-go.sh index 60b3b0078473..7952b4dc2c09 100755 --- a/ios/build-wireguard-go.sh +++ b/ios/build-wireguard-go.sh @@ -37,6 +37,8 @@ fi WIREGUARD_KIT_GO_PATH="$RESOLVED_SOURCE_PACKAGES_PATH/checkouts/wireguard-apple/Sources/WireGuardKitGo" echo "WireGuardKitGo path resolved to $WIREGUARD_KIT_GO_PATH" +export PATH=/opt/homebrew/opt/go@1.20/bin:$PATH + # Run make # shellcheck disable=SC2086 /usr/bin/make -C "$WIREGUARD_KIT_GO_PATH" $ACTION