diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 5f4342002dc0..5c89561a306d 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -9,37 +9,37 @@ on: - ios/**/*.xctestplan workflow_dispatch: jobs: - check-formatting: - name: Check formatting - runs-on: macos-13-xlarge - steps: - - name: Install SwiftFormat - run: | - brew update - brew upgrade swiftformat + # check-formatting: + # name: Check formatting + # runs-on: macos-13-xlarge + # steps: + # - name: Install SwiftFormat + # run: | + # brew update + # brew upgrade swiftformat - - name: Checkout repository - uses: actions/checkout@v3 + # - name: Checkout repository + # uses: actions/checkout@v3 - - name: Check formatting - run: | - swiftformat --version - swiftformat --lint . - working-directory: ios + # - name: Check formatting + # run: | + # swiftformat --version + # swiftformat --lint . + # working-directory: ios - swiftlint: - name: Run swiftlint - runs-on: macos-13-xlarge - steps: - - name: Checkout repository - uses: actions/checkout@v3 + # swiftlint: + # name: Run swiftlint + # runs-on: macos-13-xlarge + # steps: + # - name: Checkout repository + # uses: actions/checkout@v3 - - name: Run swiftlint - run: | - brew install swiftlint - swiftlint --version - swiftlint --reporter github-actions-logging - working-directory: ios + # - name: Run swiftlint + # run: | + # brew install swiftlint + # swiftlint --version + # swiftlint --reporter github-actions-logging + # working-directory: ios test: name: Unit tests @@ -83,17 +83,33 @@ jobs: cp Screenshots.xcconfig.template Screenshots.xcconfig working-directory: ios/Configurations - - name: Install xcbeautify - run: | - brew update - brew install xcbeautify + - name: Bundle + run: bundle install + working-directory: ios + + # - name: Install xcbeautify + # run: | + # brew update + # brew install xcbeautify + + # - name: Run tests + # run: | + # set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ + # -project MullvadVPN.xcodeproj \ + # -scheme MullvadVPN \ + # -testPlan MullvadVPNCI \ + # -destination "platform=iOS Simulator,name=iPhone 15" \ + # -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + # test 2>&1 | xcbeautify + # working-directory: ios/ - - name: Run tests + - name: Run screenshots + # run: bundle exec fastlane snapshot run: | set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ -project MullvadVPN.xcodeproj \ -scheme MullvadVPN \ - -testPlan MullvadVPNCI \ + -testPlan MullvadVPNScreenshots \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ test 2>&1 | xcbeautify diff --git a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift index 77a8380f4eaf..662694d0f044 100644 --- a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift +++ b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift @@ -59,7 +59,7 @@ class MullvadVPNScreenshots: XCTestCase { // Select Sweden, Gothenburg in Select location controller if case .phone = UIDevice.current.userInterfaceIdiom { - _ = app.buttons["SelectLocationButton"].waitForExistence(timeout: 10) + _ = app.buttons["SelectLocationButton"].waitForExistence(timeout: 30) app.buttons["SelectLocationButton"].tap() } diff --git a/ios/Screenshots/en-US/iPhone 15 Pro-Account.png b/ios/Screenshots/en-US/iPhone 15 Pro-Account.png new file mode 100644 index 000000000000..b55152def1cd Binary files /dev/null and b/ios/Screenshots/en-US/iPhone 15 Pro-Account.png differ diff --git a/ios/Screenshots/en-US/iPhone 15 Pro-MainSecured.png b/ios/Screenshots/en-US/iPhone 15 Pro-MainSecured.png new file mode 100644 index 000000000000..70d2a315a3ec Binary files /dev/null and b/ios/Screenshots/en-US/iPhone 15 Pro-MainSecured.png differ diff --git a/ios/Screenshots/en-US/iPhone 15 Pro-Preferences.png b/ios/Screenshots/en-US/iPhone 15 Pro-Preferences.png new file mode 100644 index 000000000000..ba982e1ad4af Binary files /dev/null and b/ios/Screenshots/en-US/iPhone 15 Pro-Preferences.png differ diff --git a/ios/Screenshots/en-US/iPhone 15 Pro-RelayFilter.png b/ios/Screenshots/en-US/iPhone 15 Pro-RelayFilter.png new file mode 100644 index 000000000000..ad6aeaac2347 Binary files /dev/null and b/ios/Screenshots/en-US/iPhone 15 Pro-RelayFilter.png differ diff --git a/ios/Screenshots/en-US/iPhone 15 Pro-SelectLocation.png b/ios/Screenshots/en-US/iPhone 15 Pro-SelectLocation.png new file mode 100644 index 000000000000..e446075b98c5 Binary files /dev/null and b/ios/Screenshots/en-US/iPhone 15 Pro-SelectLocation.png differ diff --git a/ios/Screenshots/screenshots.html b/ios/Screenshots/screenshots.html new file mode 100644 index 000000000000..aba7df954cc1 --- /dev/null +++ b/ios/Screenshots/screenshots.html @@ -0,0 +1,252 @@ + + +
+