From 4521e6c7e542380b435760887059de81bbfa57f4 Mon Sep 17 00:00:00 2001 From: Jon Petersson Date: Wed, 6 Dec 2023 13:03:43 +0100 Subject: [PATCH] Run screenshots action on Github --- .github/workflows/ios.yml | 42 ++++++++++++++++++++++++++++++--------- ios/Snapfile | 6 +----- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 5f4342002dc0..02e2b60c3872 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -46,6 +46,7 @@ jobs: 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 @@ -81,20 +82,43 @@ jobs: cp App.xcconfig.template App.xcconfig cp PacketTunnel.xcconfig.template PacketTunnel.xcconfig cp Screenshots.xcconfig.template Screenshots.xcconfig + sed -i "" "s/MULLVAD_ACCOUNT_TOKEN = /MULLVAD_ACCOUNT_TOKEN = $TEST_ACCOUNT/g" Configurations/Screenshots.xcconfig working-directory: ios/Configurations + # - 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 + # - 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 screenshots + run: bundle exec fastlane snapshot + # run: | + # set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ + # -project MullvadVPN.xcodeproj \ + # -scheme MullvadVPN \ + # -testPlan MullvadVPNScreenshots \ + # -destination "platform=iOS Simulator,name=iPhone 15" \ + # -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + # test 2>&1 | xcbeautify working-directory: ios/ + + - name: Upload screenshots + uses: actions/upload-artifact@v3 + with: + name: ios-screenshots + path: Screenshots diff --git a/ios/Snapfile b/ios/Snapfile index a3be439b6087..5d5d6de81161 100644 --- 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([