Skip to content

Commit

Permalink
Merge branch 'update-wireguard-apple'
Browse files Browse the repository at this point in the history
  • Loading branch information
pinkisemils committed Jul 17, 2024
2 parents 0ba177b + 7c36c7f commit 2368bb8
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ios-screenshots-creation.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-validate-build-schemas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN.xcodeproj/project.pbxproj
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
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
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
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

0 comments on commit 2368bb8

Please sign in to comment.