diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d857c68b..e7cec4238 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,26 +1,55 @@ variables: - archive_scheme: linphone - archive_path: linphone.xcarchive - export_path: linphone-adhoc-ipa - export_options_plist: linphone-adhoc.plist + workspace: linphone.xcworkspace + scheme: linphone + destination: name=iPhone 13 Pro + testResult_path: derivedData/Logs/Test + +stages: + - Build + - UITests -job-ios: +before_script: + - pod install + - pwd + - sed 's/fileprivate let tableView =/public let tableView =/g' ./Pods/DropDown/DropDown/src/DropDown.swift > tmp.swift && mv -f tmp.swift ./Pods/DropDown/DropDown/src/DropDown.swift - stage: build - tags: [ "macmini-m1-xcode13" ] - - script: +Compile & Build: + stage: Build + tags: ["macmini-m1-xcode13"] + before_script: - pod install --repo-update - pwd - sed 's/fileprivate let tableView =/public let tableView =/g' ./Pods/DropDown/DropDown/src/DropDown.swift > tmp.swift && mv -f tmp.swift ./Pods/DropDown/DropDown/src/DropDown.swift - - xcodebuild archive -scheme $archive_scheme -archivePath ./$archive_path -configuration Release -workspace ./linphone.xcworkspace -UseModernBuildSystem=YES -destination 'generic/platform=iOS' - - xcodebuild -exportArchive -archivePath ./$archive_path -exportPath ./$export_path -exportOptionsPlist ./$export_options_plist -allowProvisioningUpdates -UseModernBuildSystem=YES -destination 'generic/platform=iOS' - + - xcrun simctl shutdown "$destination" && xcrun simctl erase "$destination" + script: + - xcodebuild -workspace $workspace -scheme $scheme -UseModernBuildSystem=YES -destination "$destination" -derivedDataPath derivedData + after_script: [] artifacts: paths: - - $archive_path - - $export_path + - derivedData/Build when: always - expire_in: 1 week + expire_in: 2 hour + + +after_script: + - ${TRAINER_EXE} -p $testResult_path/*.xcresult -o $testResult_path/ + - ${XCPARSE_EXE} attachments $testResult_path/*.xcresult results --uti public.image + - mv $testResult_path/*.xcresult results && mv derivedData/logs.txt results + +Call Views: + stage: UITests + tags: ["macmini-m1-xcode13"] + dependencies: ["Compile & Build"] + script: + - xcodebuild test -workspace $workspace -scheme $scheme -sdk iphonesimulator -destination "$destination" -UseModernBuildSystem=YES -testPlan Default -derivedDataPath derivedData | tee derivedData/logs.txt + + artifacts: + paths: + - results/* + when: always + reports: + junit: + - $testResult_path/*.xml + expire_in: 4 week diff --git a/CallUITests-Info.plist b/CallUITests-Info.plist new file mode 100644 index 000000000..0c67376eb --- /dev/null +++ b/CallUITests-Info.plist @@ -0,0 +1,5 @@ + + + + + diff --git a/Classes/Base.lproj/AboutView.xib b/Classes/Base.lproj/AboutView.xib index 3aa5423fe..286b802c2 100644 --- a/Classes/Base.lproj/AboutView.xib +++ b/Classes/Base.lproj/AboutView.xib @@ -1,9 +1,9 @@ - + - + diff --git a/Classes/Base.lproj/AssistantLinkView.xib b/Classes/Base.lproj/AssistantLinkView.xib index 9990a74f9..ca7f16313 100644 --- a/Classes/Base.lproj/AssistantLinkView.xib +++ b/Classes/Base.lproj/AssistantLinkView.xib @@ -154,7 +154,7 @@ + @@ -244,7 +245,8 @@ - + + diff --git a/Classes/Base.lproj/AssistantViewScreens.xib b/Classes/Base.lproj/AssistantViewScreens.xib index 8d7a06be5..3a2eca6f0 100644 --- a/Classes/Base.lproj/AssistantViewScreens.xib +++ b/Classes/Base.lproj/AssistantViewScreens.xib @@ -72,6 +72,7 @@ + @@ -880,7 +882,7 @@ Once it is done, come back here and click on the button. - + @@ -913,7 +915,7 @@ Once it is done, come back here and click on the button. - + @@ -966,6 +968,7 @@ Once it is done, come back here and click on the button. + @@ -975,7 +978,7 @@ Once it is done, come back here and click on the button. + @@ -1614,6 +1619,7 @@ To enable it in a commercial project, please contact us. + diff --git a/Classes/Base.lproj/ChatsListView.xib b/Classes/Base.lproj/ChatsListView.xib index a9ecaa1a0..8efd7306c 100644 --- a/Classes/Base.lproj/ChatsListView.xib +++ b/Classes/Base.lproj/ChatsListView.xib @@ -1,9 +1,9 @@ - + - + @@ -96,6 +96,7 @@ - + - + @@ -266,14 +267,14 @@ + @@ -69,7 +71,9 @@