diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-06-21 11:10:04 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-06-21 11:10:04 +0200 |
| commit | 896348f904360217896b92a8db406220484a993a (patch) | |
| tree | 57324511c45e3a8e8c1eef773c583333fbef3dc7 | |
| parent | 1c7f284c710f3b96f8849d9ad7de989c8f8a5fe0 (diff) | |
| parent | 0d3d6650a9d57a85dd441663a4f504729ef8d52c (diff) | |
| download | mullvadvpn-896348f904360217896b92a8db406220484a993a.tar.xz mullvadvpn-896348f904360217896b92a8db406220484a993a.zip | |
Merge branch 'update-wireguard-go'
4 files changed, 12 insertions, 9 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 97a4383456..4a055735c8 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -17,6 +17,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup go-lang + uses: actions/setup-go@v2 + with: + go-version: '1.16.5' + - name: Prepare iOS 12 simulator run: | sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes @@ -24,7 +29,7 @@ jobs: - name: Build and test run: | - xcodebuild clean test -project MullvadVPN.xcodeproj -scheme MullvadVPNTests -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO + xcodebuild clean test -project MullvadVPN.xcodeproj -scheme MullvadVPNTests -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=YES working-directory: ios env: destination: ${{ matrix.destination }} diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 749e844fc3..781919a32d 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -1638,8 +1638,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://git.zx2c4.com/wireguard-apple"; requirement = { - kind = exactVersion; - version = "1.0.12-22"; + kind = revision; + revision = c1f509d65bba1c00c6b6ef93826f658ff36a0761; }; }; /* 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 58780c69e1..8008fae640 100644 --- a/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -11,12 +11,12 @@ } }, { - "package": "WireGuardKit", + "package": "wireguard-apple", "repositoryURL": "https://git.zx2c4.com/wireguard-apple", "state": { "branch": null, - "revision": "c4f79beb8d23078393451d1173f3b9342c6ea66e", - "version": "1.0.12-22" + "revision": "c1f509d65bba1c00c6b6ef93826f658ff36a0761", + "version": null } } ] diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index 8f3d83426a..bee420458f 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -551,10 +551,8 @@ extension PacketTunnelState: CustomStringConvertible, CustomDebugStringConvertib extension WireGuardLogLevel { var loggerLevel: Logger.Level { switch self { - case .debug: + case .verbose: return .debug - case .info: - return .info case .error: return .error } |