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.

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

Update wireguard-apple #6473

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Update wireguard-apple #6473

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/ios-screenshots-creation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-screenshots-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: iOS test screenshots
on:

Check warning on line 3 in .github/workflows/ios-screenshots-tests.yml

View workflow job for this annotation

GitHub Actions / check-formatting 

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
types:
- closed
Expand Down Expand Up @@ -35,7 +35,7 @@
- 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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-validate-build-schemas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: iOS Validate build schemas
on:

Check warning on line 3 in .github/workflows/ios-validate-build-schemas.yml

View workflow job for this annotation

GitHub Actions / check-formatting 

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
types:
- closed
Expand Down Expand Up @@ -36,7 +36,7 @@
- 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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: iOS app
on:

Check warning on line 3 in .github/workflows/ios.yml

View workflow job for this annotation

GitHub Actions / check-formatting 

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
paths:
- .github/workflows/ios.yml
Expand Down Expand Up @@ -62,7 +62,7 @@
- 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: |
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9111,7 +9111,7 @@
repositoryURL = "https://github.com/mullvad/wireguard-apple.git";
requirement = {
kind = revision;
revision = 15242e1698fc45261285d7417ed2cd5130d7332e;
revision = 5f24cdf1aa7fc1802f1695473aab95b4451e4ba0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mullvad/wireguard-apple.git",
"state" : {
"revision" : "15242e1698fc45261285d7417ed2cd5130d7332e"
"revision" : "5f24cdf1aa7fc1802f1695473aab95b4451e4ba0"
}
}
],
Expand Down
2 changes: 2 additions & 0 deletions ios/PacketTunnel/WireGuardAdapter/WireGuardAdapterError+Localization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
}
}
2 changes: 2 additions & 0 deletions ios/build-wireguard-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]/bin:$PATH

# Run make
# shellcheck disable=SC2086
/usr/bin/make -C "$WIREGUARD_KIT_GO_PATH" $ACTION
Loading