status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix local release PR builds (were missing js modules) 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-08-23 17:23:42 +02:00
parent 78be542f0b
commit 78754dfdee
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/android.groovy
View File

@ -10,10 +10,7 @@ def bundle() {
env.NDK_ABI_FILTERS="armeabi-v7a;arm64-v8a" env.NDK_ABI_FILTERS="armeabi-v7a;arm64-v8a"
switch (btype) { switch (btype) {
case 'pr': /* PR builds shouldn't replace normal releases */
target = 'pr'; break;
case 'e2e': case 'e2e':
target = 'pr';
env.NDK_ABI_FILTERS="x86"; break env.NDK_ABI_FILTERS="x86"; break
case 'release': case 'release':
gradleOpt += "-PreleaseVersion='${utils.getVersion()}'" gradleOpt += "-PreleaseVersion='${utils.getVersion()}'"

2
nix/mobile/android/targets/release-android.nix
View File

@ -20,7 +20,7 @@ let
envFileName = envFileName =
if (build-type == "release" || build-type == "nightly" || build-type == "e2e") then ".env.${build-type}" else if (build-type == "release" || build-type == "nightly" || build-type == "e2e") then ".env.${build-type}" else
if build-type != "" then ".env.jenkins" else ".env"; if build-type != "" then ".env.jenkins" else ".env";
buildType' = if (build-type == "release" || build-type == "nightly") then "release" else "pr"; buildType' = if (build-type == "pr" || build-type == "e2e") then "pr" else "release"; /* PR builds shouldn't replace normal releases */
generatedApkPath = "android/app/build/outputs/apk/${buildType'}/app-${buildType'}.apk"; generatedApkPath = "android/app/build/outputs/apk/${buildType'}/app-${buildType'}.apk";
outApkName = "app.apk"; outApkName = "app.apk";