Skip to content

issue 738 build and scan swift tests one step #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 2 commits into from
Oct 25, 2021
Merged

issue 738 build and scan swift tests one step #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6774e55
issue 738 build and scan swift tests one step
flowcrypt-machine-user Oct 25, 2021
d1a1416
join TypeScript + Swift tests to run in sequence
flowcrypt-machine-user Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 6 additions & 27 deletions .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,6 @@ auto_cancel:
running:
when: branch != 'master'
blocks:
- name: Ubuntu iOS tests
execution_time_limit:
minutes: 5
task:
agent:
machine:
type: e1-standard-4
os_image: ubuntu1804
env_vars:
- name: LANG
value: en_US.UTF-8
- name: SEMAPHORE_GIT_DIR
value: /home/semaphore/git/flowcrypt-ios
prologue:
commands:
- checkout
- cd ~/git/flowcrypt-ios/
jobs:
- name: TypeScript - Core standalone tests
commands:
- sem-version node 12 && mkdir .custom-npm && cd .custom-npm && npm install npm@7.23.0 && cd ../Core
- cache restore core-npm && ../.custom-npm/node_modules/.bin/npm install && cache store core-npm node_modules
- ../.custom-npm/node_modules/.bin/npm test
- name: Mac iOS tests
execution_time_limit:
minutes: 55
Expand All @@ -48,16 +25,18 @@ blocks:
commands:
- checkout && sem-version node 12 && cd ~/git/flowcrypt-ios/
- cache restore && make dependencies && cache store
- sem-version node 12 && mkdir .custom-npm && cd .custom-npm && npm install npm@7.23.0 && cd ..
jobs:
- name: Swift tests
commands:
- bundle exec fastlane test
- name: Appium tests
- name: Appium UI tests
commands:
- mv ~/appium-env ~/git/flowcrypt-ios/appium/.env
- cache restore appium-npm && cd ./appium && npm i && cd .. && cache store appium-npm appium/node_modules
- bundle exec fastlane build
- ls -la appium && cd appium && npm run-script only.test.all
- name: TypeScript + Swift tests
commands:
- ( cd Core && cache restore core-npm && ../.custom-npm/node_modules/.bin/npm install && cache store core-npm node_modules && ../.custom-npm/node_modules/.bin/npm test )
- bundle exec fastlane test
epilogue:
on_fail:
commands:
Expand Down
20 changes: 2 additions & 18 deletions fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,7 @@ platform :ios do
)
end

# original build using gym - does not support exporting app for Appium
# desc "Build for CI testing"
# lane :build do |options|
# gym(
# scheme: "Debug FlowCrypt",
# skip_package_ipa: true,
# skip_archive: true,
# silent: true,
# clean: false,
# skip_codesigning: true,
# configuration: "Debug"
# )
# end

desc "Build for swift and UI tests"
desc "Build for UI tests"
lane :build do
xcbuild(
workspace: "FlowCrypt.xcworkspace",
Expand All @@ -40,10 +26,8 @@ platform :ios do

desc "Run Swift tests"
lane :test do
build
scan(
scheme: "FlowCryptAppTests",
skip_build: true
scheme: "FlowCryptAppTests"
)
end

Expand Down