Skip to content

[Fix 8635] About showed "Version ()" instead of Version 0.14.0 (2019…)#8821

Merged
flexsurfer merged 1 commit intostatus-im:developfrom
MajorTomSec:develop
Aug 26, 2019
Merged

[Fix 8635] About showed "Version ()" instead of Version 0.14.0 (2019…)#8821
flexsurfer merged 1 commit intostatus-im:developfrom
MajorTomSec:develop

Conversation

@MajorTomSec
Copy link
Copy Markdown
Contributor

fixes #8635

Summary

This fixes #8635 by adding VERSION and BUILD_NUMBER files in the correct nix template and updating bash script in order to prevent it from failing, due to the git repository being not initialized in the nix environment.

Platforms

  • Android
  • iOS
  • macOS
  • Linux
  • Windows

Steps to test

  • Open Status
  • Create an account
  • Open Profile -> About and check value shown for Version

status: ready

@ghost
Copy link
Copy Markdown

ghost commented Aug 22, 2019

Hey @MajorTomSec, and thank you so much for making your first pull request in status-react! ❤️ Please help us make your experience better by filling out this brief questionnaire https://goo.gl/forms/uWqNcVpVz7OIopXg2

@ghost
Copy link
Copy Markdown

ghost commented Aug 22, 2019

Pull Request Checklist

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

@status-im-auto
Copy link
Copy Markdown
Member

status-im-auto commented Aug 22, 2019

Jenkins Builds

Click to see older builds (3)
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 6e0827d #1 2019-08-22 17:26:48 ~11 min ios 📦 ipa
✔️ 6e0827d #1 2019-08-22 17:28:01 ~12 min android 📦 apk
✔️ 6e0827d #1 2019-08-22 17:28:12 ~12 min android-e2e 📦 apk
Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 8c134cf7 #2 2019-08-23 14:38:29 ~11 min ios 📦 ipa
✔️ 8c134cf7 #2 2019-08-23 14:52:10 ~25 min android 📦 apk
✔️ 8c134cf7 #2 2019-08-23 14:52:31 ~25 min android-e2e 📦 apk
✔️ e84d134 #3 2019-08-23 17:28:49 ~11 min ios 📦 ipa
✔️ e84d134 #3 2019-08-23 17:34:49 ~17 min android 📦 apk
✔️ e84d134 #3 2019-08-23 17:35:05 ~17 min android-e2e 📦 apk

Comment thread scripts/build_no.sh Outdated
@statustestbot
Copy link
Copy Markdown

91% of end-end tests have passed

Total executed tests: 45
Failed tests: 4
Passed tests: 41

Failed tests (4)

Click to expand
1. test_long_press_to_delete_public_chat

Device 1: Looking for a message by text: 'test message'
Device 1: Wait for ChatElementByText

Chat history is shown

Device sessions

2. test_can_add_existing_ens

Device 1: Looking for an element by text part: 'Username added'
Device 1: Looking for an element by text: 'Ok, got it'

Device 1: 'BaseButton' is not found on the screen; also Unexpected Alert is shown: 'Cannot write BigNumber'

Device sessions

3. test_offline_status

Device 1: Tap on PlusButton
Device 1: Wait for StartNewChatButton

Device 1: 'StartNewChatButton' is not found on the screen

Device sessions

4. test_user_can_remove_profile_picture

Device 1: Wait for DefaultUserNameText
Device 1: Wait for DefaultUserNameText

Device 1: 'ProfilePictureElement' is not found on the screen

Device sessions

Passed tests (41)

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_deploy_contract_from_daap
Device sessions

6. test_open_transaction_on_etherscan
Device sessions

7. test_public_chat_messaging
Device sessions

8. test_long_press_to_delete_1_1_chat
Device sessions

9. test_password_in_logcat_sign_in
Device sessions

10. test_text_message_1_1_chat
Device sessions

11. test_add_to_contacts
Device sessions

12. test_sign_typed_message
Device sessions

13. test_unread_messages_counter_1_1_chat
Device sessions

14. test_logcat_send_transaction_from_daap
Device sessions

15. test_send_message_in_group_chat
Device sessions

16. test_logcat_send_transaction_from_wallet
Device sessions

17. test_send_token_with_7_decimals
Device sessions

18. test_offline_messaging_1_1_chat
Device sessions

19. test_modify_transaction_fee_values
Device sessions

20. test_send_eth_from_wallet_to_address
Device sessions

21. test_add_account_to_multiaccount_instance
Device sessions

22. test_manage_assets
Device sessions

23. test_send_emoji
Device sessions

24. test_search_chat_on_home
Device sessions

25. test_logcat_recovering_account
Device sessions

26. test_messaging_in_different_networks
Device sessions

27. test_logcat_sign_message_from_daap
Device sessions

28. test_switch_users_and_add_new_account
Device sessions

29. test_send_stt_from_wallet
Device sessions

30. test_login_with_new_account
Device sessions

31. test_start_chat_with_ens
Device sessions

32. test_add_contact_from_public_chat
Device sessions

33. test_send_two_transactions_one_after_another_in_dapp
Device sessions

34. test_password_in_logcat_creating_account
Device sessions

35. test_backup_recovery_phrase
Device sessions

36. test_open_google_com_via_open_dapp
Device sessions

37. test_unread_messages_counter_public_chat
Device sessions

38. test_sign_message_from_daap
Device sessions

39. test_share_contact_code_and_wallet_address
Device sessions

40. test_refresh_button_browsing_app_webview
Device sessions

41. test_backup_recovery_phrase_warning_from_wallet
Device sessions

Copy link
Copy Markdown
Contributor

@pedropombeiro pedropombeiro left a comment

Choose a reason for hiding this comment

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

Great job so far @MajorTomSec! Just added a couple questions/remarks.

Comment thread scripts/build_no.sh Outdated
Comment thread nix/targets/jsbundle.nix Outdated
@MajorTomSec MajorTomSec requested a review from a team as a code owner August 23, 2019 14:26
@MajorTomSec
Copy link
Copy Markdown
Contributor Author

MajorTomSec commented Aug 23, 2019

Thanks for the reviews.
I took into account all of your remarks and came up with this.

@pombeirp the issue is indeed with https://github.com/status-im/status-react/blob/develop/src/status_im/utils/build.clj#L25 and this is why the VERSION file has to be added to nix as well (see here

I thought instead of using an env variable for specifying BUILD_NUMBER_FILE, I used pwd when git is not available:
GIT_ROOT=$(git rev-parse --show-toplevel || pwd)

I believe this way nothing would be broken. As build.clj uses relative path for VERSION and the script path, this would not fail here anyway.

Let me know if you have other remarks.

EDIT: @pombeirp we cannot keep the set -e with the workaround I put there.
But your workaround seems to solve the issue, nice one ! I will update ASAP.

@MajorTomSec
Copy link
Copy Markdown
Contributor Author

I believe everything should be fine by now.
Waiting for any other remark anyone might have.

DEV_BUILD_NUMBER=9999
BUILD_NUMBER_FILE="${GIT_ROOT}/BUILD_NUMBER"

SCRIPTPATH="$(cd "$(dirname "$0")" ; pwd -P)"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's okay, but I kinda like your suggestion of:

GIT_ROOT=$(git rev-parse --show-toplevel || pwd)

It's a nice trick, but this works too.

@yenda
Copy link
Copy Markdown
Contributor

yenda commented Aug 25, 2019

@pombeirp seems like your request for changes has been fulfilled?

@churik
Copy link
Copy Markdown
Contributor

churik commented Aug 26, 2019

Checked on Android 8.0 and IOS 11.4.1.
Failed e2e are not related to PR.
@MajorTomSec thank you for the contribution!

…8...) on Android

Fixes #8635 by adding VERSION and BUILD_NUMBER files in the correct nix
template and updating bash script in order to prevent it from failing,
due to the git repository being not initialized in the nix environment.

Move scripts/build_no.sh and scripts/gen_build_no.sh to
scripts/version/build_no.sh to prevent Nix from rebuilding when
unrelated scripts are touched.

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Archived in project

Development

Successfully merging this pull request may close these issues.

About shows "Version ()" instead of Version 0.14.0 (201907...) on Android

8 participants