Run screenshots action on Github

mullvad · Dec 7, 2023 · 0935d6e · 0935d6e
1 parent df3262c
commit 0935d6e
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 41 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -9,43 +9,44 @@ 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
     runs-on: macos-13-xlarge
     env:
       SOURCE_PACKAGES_PATH: .spm
+      TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -83,18 +84,34 @@ 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: |
+          sed -i "" "s/MULLVAD_ACCOUNT_TOKEN = /MULLVAD_ACCOUNT_TOKEN = $TEST_ACCOUNT/g" Configurations/Screenshots.xcconfig \
           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
+            -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH"
         working-directory: ios/
diff --git 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: 90)
             app.buttons["SelectLocationButton"].tap()
         }
 

diff --git a/ios/Snapfile b/ios/Snapfile
@@ -1,10 +1,6 @@
 # A list of devices you want to take the screenshots from
 devices([
-  "iPhone 8 Plus", # 5.5"
-  "iPhone 11 Pro Max", # 6.5"
-  "iPhone 14 Pro Max", # 6.7"
-  "iPad Pro (12.9-inch) (2nd generation)",
-  "iPad Pro (12.9-inch) (6th generation)"
+  "iPhone 14"
 ])
 
 languages([