From 78754dfdee2f0c474766581a017b6a14b424cc64 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Fri, 23 Aug 2019 17:23:42 +0200 Subject: [PATCH] Fix local release PR builds (were missing js modules) Signed-off-by: Pedro Pombeiro --- ci/android.groovy | 3 --- nix/mobile/android/targets/release-android.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/android.groovy b/ci/android.groovy index 3566b2257c..2b8b3f6d96 100644 --- a/ci/android.groovy +++ b/ci/android.groovy @@ -10,10 +10,7 @@ def bundle() { env.NDK_ABI_FILTERS="armeabi-v7a;arm64-v8a" switch (btype) { - case 'pr': /* PR builds shouldn't replace normal releases */ - target = 'pr'; break; case 'e2e': - target = 'pr'; env.NDK_ABI_FILTERS="x86"; break case 'release': gradleOpt += "-PreleaseVersion='${utils.getVersion()}'" diff --git a/nix/mobile/android/targets/release-android.nix b/nix/mobile/android/targets/release-android.nix index 0e5d8a77da..88be135e87 100644 --- a/nix/mobile/android/targets/release-android.nix +++ b/nix/mobile/android/targets/release-android.nix @@ -20,7 +20,7 @@ let envFileName = if (build-type == "release" || build-type == "nightly" || build-type == "e2e") then ".env.${build-type}" else 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"; outApkName = "app.apk";