Skip to content
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

Jump to bottom

Minor fixes #8402

Merged
merged 3 commits into from
Jun 13, 2019
Merged

Minor fixes #8402

merged 3 commits into from
Jun 13, 2019

Conversation

pedropombeiro
Copy link
Contributor

@pedropombeiro pedropombeiro commented Jun 11, 2019 •
edited by StatusWrike
Loading

Summary

This PR adds code to remove watchman watches in the CI server after the build completes, and adds some minor fixes.

Documentation change PR (review please): https://github.com/status-im/status.im/pull/362

status: ready

@pedropombeiro pedropombeiro requested a review from a team as a code owner June 11, 2019 14:37
@pedropombeiro pedropombeiro self-assigned this Jun 11, 2019
@auto-assign auto-assign bot removed the request for review from a team June 11, 2019 14:37
@status-github-bot
Copy link

status-github-bot bot commented Jun 11, 2019 •
edited by pedropombeiro
Loading

Pull Request Checklist

  • Have you updated the documentation, if impacted (e.g. docs.status.im)?

jakubgs
jakubgs approved these changes Jun 11, 2019
View reviewed changes
ci/Jenkinsfile.android Outdated
@@ -103,6 +103,7 @@ pipeline {
}
stage('Cleanup') {
steps {
cmn.nix.shell 'watchman watch-del $(pwd)'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it make more sense to just run this in the clean target of our Makefile?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a dev-side scenario and outside of the scope of this PR (though we could add it if we're sure of what we want to do there). This is just to make sure we don't leave new watches running in CI.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then at least make it a separate target like watchman-clean and call it with sh 'make watchman-clean', othewise you have to add a script {} block in the Jenkinsfile.

@flexsurfer
Copy link
Member

no change for xcode version?

@pedropombeiro
Copy link
Contributor Author

no change for xcode version?

@flexsurfer We could switch to require 10.2 if everyone agrees. I think it makes more sense than requiring 10.1, since it's easier to upgrade than to downgrade. Loosening the requirements to 10.x takes more work, since the default script in nixpkgs doesn't support that.

@pedropombeiro pedropombeiro force-pushed the fix/minor-fixes branch 2 times, most recently from a1581cb to 39735f9 Compare June 12, 2019 12:35
@status-im-auto
Copy link
Member

status-im-auto commented Jun 12, 2019 •
edited
Loading

Jenkins Builds

Click to see older builds (20)
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
❌ 39735f9 #3 2019-06-12 12:36:05 ~36 sec macos 📄 log
❌ 39735f9 #3 2019-06-12 12:36:10 ~43 sec ios 📄 log
❌ 39735f9 #3 2019-06-12 12:36:36 ~1 min linux 📄 log
❌ 39735f9 #3 2019-06-12 12:39:10 ~3 min windows 📄 log
❌ 39735f9 #3 2019-06-12 12:42:48 ~7 min android 📄 log
❌ 39735f9 #3 2019-06-12 12:42:50 ~7 min android-e2e 📄 log
❌ 14a7017 #4 2019-06-12 15:02:23 ~28 sec ios 📄 log
❌ 14a7017 #4 2019-06-12 15:02:26 ~28 sec macos 📄 log
❌ 6ddad0c #5 2019-06-12 15:03:41 ~25 sec ios 📄 log
❌ 6ddad0c #5 2019-06-12 15:03:51 ~26 sec macos 📄 log
✔️ 6ddad0c #5 2019-06-12 15:15:06 ~11 min android 📦 apk
✔️ 6ddad0c #5 2019-06-12 15:15:49 ~12 min android-e2e 📦 apk
✔️ 6ddad0c #5 2019-06-12 15:16:48 ~13 min linux 📦 App
✔️ 6ddad0c #5 2019-06-12 15:19:01 ~15 min windows 📦 exe
❌ 6ddad0c #6 2019-06-12 15:35:01 ~34 sec macos 📄 log
❌ 6ddad0c #6 2019-06-12 15:35:27 ~34 sec ios 📄 log
❌ 6ddad0c #7 2019-06-12 16:01:52 ~25 sec ios 📄 log
❌ 6ddad0c #7 2019-06-12 17:59:11 ~26 sec macos 📄 log
❌ 6ddad0c #8 2019-06-12 17:59:32 ~22 sec ios 📄 log
❌ 6ddad0c #8 2019-06-12 18:13:41 ~22 sec macos 📄 log
❔ Commit #️⃣ Finished (UTC) Duration Platform Result
❌ 950bb34 #9 2019-06-12 18:18:43 ~31 sec ios 📄 log
❌ 950bb34 #9 2019-06-12 18:18:48 ~31 sec macos 📄 log
✔️ 950bb34 #6 2019-06-12 18:32:16 ~14 min linux 📦 App
✔️ 950bb34 #6 2019-06-12 18:33:27 ~15 min windows 📦 exe
✔️ 950bb34 #6 2019-06-12 18:33:29 ~15 min android 📦 apk
✔️ 950bb34 #6 2019-06-12 18:34:04 ~15 min android-e2e 📦 apk
❌ 1345ab5 #10 2019-06-12 19:35:19 ~31 sec ios 📄 log
❌ 1345ab5 #10 2019-06-12 19:35:21 ~29 sec macos 📄 log
✔️ 1345ab5 #7 2019-06-12 19:48:36 ~13 min linux 📦 App
✔️ 1345ab5 #7 2019-06-12 19:50:31 ~15 min windows 📦 exe
✔️ 1345ab5 #7 2019-06-12 19:50:54 ~16 min android 📦 apk
✔️ 1345ab5 #7 2019-06-12 19:51:04 ~16 min android-e2e 📦 apk
❌ 1345ab5 #11 2019-06-13 08:54:50 ~29 sec macos 📄 log
❌ 1345ab5 #11 2019-06-13 08:54:50 ~25 sec ios 📄 log
✔️ 1345ab5 #12 2019-06-13 09:12:25 ~16 min ios 📦 ipa
✔️ 1345ab5 #12 2019-06-13 09:13:46 ~18 min macos 📦 dmg
❌ 1345ab5 #13 2019-06-13 12:25:15 ~19 sec macos 📄 log

@pedropombeiro pedropombeiro force-pushed the fix/minor-fixes branch 2 times, most recently from 14a7017 to 6ddad0c Compare June 12, 2019 15:03
@pedropombeiro
Copy link
Contributor Author

Please review docs in https://github.com/status-im/status.im/pull/362

@statustestbot
Copy link

100% of end-end tests have passed

Total executed tests: 47
Failed tests: 0
Passed tests: 47

Passed tests (47)

Click to expand
1. test_block_user_from_public_chat
Device sessions

2. test_filters_from_daap
Device sessions

3. test_copy_and_paste_messages
Device sessions

4. test_send_transaction_from_daap
Device sessions

5. test_request_and_receive_tokens_in_1_1_chat
Device sessions

6. test_deploy_contract_from_daap
Device sessions

7. test_open_transaction_on_etherscan
Device sessions

8. test_public_chat_messaging
Device sessions

9. test_long_press_to_delete_1_1_chat
Device sessions

10. test_password_in_logcat_sign_in
Device sessions

11. test_text_message_1_1_chat
Device sessions

12. test_add_to_contacts
Device sessions

13. test_sign_typed_message (TestRail link is not found)
Device sessions

14. test_unread_messages_counter_1_1_chat
Device sessions

15. test_logcat_send_transaction_from_daap
Device sessions

16. test_send_message_in_group_chat
Device sessions

17. test_logcat_send_transaction_from_wallet
Device sessions

18. test_send_token_with_7_decimals
Device sessions

19. test_send_eth_from_wallet_to_address
Device sessions

20. test_manage_assets
Device sessions

21. test_logcat_send_transaction_in_1_1_chat
Device sessions

22. test_request_and_receive_eth_in_1_1_chat
Device sessions

23. test_long_press_to_delete_public_chat
Device sessions

24. test_send_emoji
Device sessions

25. test_search_chat_on_home
Device sessions

26. test_logcat_recovering_account
Device sessions

27. test_messaging_in_different_networks
Device sessions

28. test_send_tokens_in_1_1_chat
Device sessions

29. test_network_mismatch_for_send_request_commands
Device sessions

30. test_logcat_sign_message_from_daap
Device sessions

31. test_switch_users_and_add_new_account
Device sessions

32. test_send_stt_from_wallet
Device sessions

33. test_login_with_new_account
Device sessions

34. test_send_eth_from_wallet_to_contact
Device sessions

35. test_add_contact_from_public_chat
Device sessions

36. test_send_two_transactions_one_after_another_in_dapp
Device sessions

37. test_password_in_logcat_creating_account
Device sessions

38. test_backup_recovery_phrase
Device sessions

39. test_offline_status
Device sessions

40. test_open_google_com_via_open_dapp
Device sessions

41. test_unread_messages_counter_public_chat
Device sessions

42. test_sign_message_from_daap
Device sessions

43. test_user_can_remove_profile_picture
Device sessions

44. test_share_contact_code_and_wallet_address
Device sessions

45. test_request_eth_in_wallet
Device sessions

46. test_refresh_button_browsing_app_webview
Device sessions

47. test_backup_recovery_phrase_warning_from_wallet
Device sessions

Pedro Pombeiro added 3 commits June 13, 2019 15:03
@pedropombeiro pedropombeiro merged commit 79db8e5 into develop Jun 13, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix/minor-fixes branch June 13, 2019 13:04
@weekly-digest weekly-digest bot mentioned this pull request Jun 16, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakubgs jakubgs jakubgs approved these changes

@cammellos cammellos cammellos approved these changes

@rasom rasom Awaiting requested review from rasom

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Legacy QA Automation Project
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pedropombeiro @flexsurfer @status-im-auto @statustestbot @cammellos @jakubgs