From 3f65c572586af8b4f854a6625a0674b89c08fa4a Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 1 Mar 2019 15:20:31 -0800 Subject: [PATCH] Fix CI release builds --- android/containerized_build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/containerized_build.sh b/android/containerized_build.sh index 34e620ad2e..1ca597b2b9 100755 --- a/android/containerized_build.sh +++ b/android/containerized_build.sh @@ -9,6 +9,10 @@ docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f docker/D # So make sure we use VERSION_CODE consistently test -z "$VERSION_CODE" && export VERSION_CODE=$VERSION +# PR builds don't populate STABLE_BUILD, but the release builds do, and the build +# bash script requires it, so we need to populate it if it's not present +test -z "$STABLE_BUILD" && export STABLE_BUILD=0 + # FIXME figure out which of these actually need to be forwarded and which can be eliminated docker run \ --rm \ @@ -29,6 +33,7 @@ docker run \ -e OAUTH_CLIENT_ID \ -e OAUTH_REDIRECT_URI \ -e SHA7 \ + -e STABLE_BUILD \ -e VERSION_CODE \ "${DOCKER_IMAGE_NAME}" \ sh -c "./build_android.sh"