Skip to content

Bumping wireguard-apple #6999

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

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Bumping wireguard-apple #6999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86528b
Update docs and scripts for go1.21
pinkisemils Oct 17, 2024
e5ddfb7
Bump the submodule
pinkisemils Oct 17, 2024
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 @@ -26,7 +26,7 @@ jobs:
- name: Setup go-lang
uses: actions/setup-go@v3
with:
go-version: 1.20.14
go-version: 1.21.13

- 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
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup go-lang
uses: actions/setup-go@v3
with:
go-version: 1.20.14
go-version: 1.21.13

- 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
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup go-lang
uses: actions/setup-go@v3
with:
go-version: 1.20.14
go-version: 1.21.13

- 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
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Setup go-lang
uses: actions/setup-go@v3
with:
go-version: 1.20.14
go-version: 1.21.13

- name: Install xcbeautify
run: |
Expand Down
4 changes: 2 additions & 2 deletions ios/BuildInstructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## Dependencies

One needs Go v1.20 and the latest stable rust to build the app.
One needs Go v1.21 and the latest stable rust to build the app.
Go can be installed via
```bash
brew install go@1.20
brew install go@1.21
```

Rust should be installed via [rustup](https://rustup.rs). Once rust is
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 @@ -9244,7 +9244,7 @@
repositoryURL = "https://github.com/mullvad/wireguard-apple.git";
requirement = {
kind = revision;
revision = f1401d43f9d03438a81ca806b9f0c20269b116cb;
revision = afb345188c187dddafae0f9e27c5466be11451c2;
};
};
/* 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" : "f1401d43f9d03438a81ca806b9f0c20269b116cb"
"revision" : "afb345188c187dddafae0f9e27c5466be11451c2"
}
}
],
Expand Down
10 changes: 5 additions & 5 deletions ios/MullvadVPNUITests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ When adding more files with test suites they must be added to the `MullvadVPNUIT
To run tests locally you need to make sure you have copied the configuration template `UITests.xcconfig.template` to `UITests.xcconfig` and set up the configuration attributes. The configuration attributes you're mostly likely to want to set custom values for are at the top:
```
// Pin code of the iOS device under test.
IOS_DEVICE_PIN_CODE =
IOS_DEVICE_PIN_CODE =

// UUID to identify test runs. Should be unique per test device. Generate with for example uuidgen on macOS.
TEST_DEVICE_IDENTIFIER_UUID =
TEST_DEVICE_IDENTIFIER_UUID =
```

Look through other configuration attributes as well, but it is likely that their default value should be kept. Default values are set with local test execution in mind. They are changed in CI.

The test device must be on the office WiFi `app-team-ios-tests` in order to be able to run tests making use of the firewall and packet capture APIs.
The test device must be on the office WiFi `app-team-ios-tests` in order to be able to run tests making use of the firewall and packet capture APIs.

## CI setup
### iOS device setup
Expand Down Expand Up @@ -56,8 +56,8 @@ The test device must be on the office WiFi `app-team-ios-tests` in order to be a
9. Install Rust and add iOS targets
- `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
- `rustup target install aarch64-apple-ios aarch64-apple-ios-sim`
10. Install Go 1.20
- `brew install go@1.20`
10. Install Go 1.21
- `brew install go@1.21`

### GitHub runner setup
1. Ask GitHub admin for new runner token and setup steps from GitHub. Set it up according to the steps, pass `--labels ios-test` to `config.sh` when running it. By default it will also have the labels `self-hosted` and `macOS` which are required as well.
Expand Down
2 changes: 1 addition & 1 deletion ios/build-wireguard-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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
export PATH=/opt/homebrew/opt/go@1.21/bin:$PATH

# Run make
# shellcheck disable=SC2086
Expand Down
Loading