[Fix 8635] About showed "Version ()" instead of Version 0.14.0 (2019…)#8821
[Fix 8635] About showed "Version ()" instead of Version 0.14.0 (2019…)#8821flexsurfer merged 1 commit intostatus-im:developfrom MajorTomSec:develop
Conversation
|
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 |
Pull Request Checklist
|
Jenkins BuildsClick to see older builds (3)
|
91% of end-end tests have passedFailed tests (4)Click to expand
Passed tests (41)Click to expand |
pedropombeiro
left a comment
There was a problem hiding this comment.
Great job so far @MajorTomSec! Just added a couple questions/remarks.
|
Thanks for the reviews. @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: 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. |
|
I believe everything should be fine by now. |
| DEV_BUILD_NUMBER=9999 | ||
| BUILD_NUMBER_FILE="${GIT_ROOT}/BUILD_NUMBER" | ||
|
|
||
| SCRIPTPATH="$(cd "$(dirname "$0")" ; pwd -P)" |
There was a problem hiding this comment.
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.
|
@pombeirp seems like your request for changes has been fulfilled? |
|
Checked on Android 8.0 and IOS 11.4.1. |
…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>
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
Steps to test
status: ready