From d86528bf879e5fc4981268180c7710807137e2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C4=ABls?= Date: Thu, 17 Oct 2024 09:04:22 +0200 Subject: [PATCH 1/2] Update docs and scripts for go1.21 --- .github/workflows/ios-screenshots-creation.yml | 2 +- .github/workflows/ios-screenshots-tests.yml | 2 +- .github/workflows/ios-validate-build-schemas.yml | 2 +- .github/workflows/ios.yml | 2 +- ios/BuildInstructions.md | 4 ++-- ios/MullvadVPNUITests/README.md | 10 +++++----- ios/build-wireguard-go.sh | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml index f6f9da06b328..257e5eb78911 100644 --- a/.github/workflows/ios-screenshots-creation.yml +++ b/.github/workflows/ios-screenshots-creation.yml @@ -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: | diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index 7be181af626e..c4d027fb12f2 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -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: | diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index ae0610d3445f..696483bb097d 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -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: | diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 8c0468641f2e..e68387fd7ed3 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -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: | diff --git a/ios/BuildInstructions.md b/ios/BuildInstructions.md index 7900b7117f3f..bc586d00a5c6 100644 --- a/ios/BuildInstructions.md +++ b/ios/BuildInstructions.md @@ -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 diff --git a/ios/MullvadVPNUITests/README.md b/ios/MullvadVPNUITests/README.md index e051cc31fb07..e2386f7e43de 100644 --- a/ios/MullvadVPNUITests/README.md +++ b/ios/MullvadVPNUITests/README.md @@ -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 @@ -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. diff --git a/ios/build-wireguard-go.sh b/ios/build-wireguard-go.sh index 7952b4dc2c09..dcb1f5831f0a 100755 --- a/ios/build-wireguard-go.sh +++ b/ios/build-wireguard-go.sh @@ -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 From e5ddfb7892835f05d2d631d8340f13fd204cb275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C4=ABls?= Date: Thu, 17 Oct 2024 09:08:19 +0200 Subject: [PATCH 2/2] Bump the submodule --- ios/MullvadVPN.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 3fbcde92afb4..2bd37ffa6cc1 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -9244,7 +9244,7 @@ repositoryURL = "https://github.com/mullvad/wireguard-apple.git"; requirement = { kind = revision; - revision = f1401d43f9d03438a81ca806b9f0c20269b116cb; + revision = afb345188c187dddafae0f9e27c5466be11451c2; }; }; /* 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 09aa5c9a58a3..2b8fd8c64f52 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" : "f1401d43f9d03438a81ca806b9f0c20269b116cb" + "revision" : "afb345188c187dddafae0f9e27c5466be11451c2" } } ],