From 9a9414246d34e89dc3305f07da2eadd21ee24aac Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Wed, 11 Mar 2020 23:52:04 -0400
Subject: fix publish fraction logic in script

---
 .github/actions/deploy/deploy.sh | 2 +-
 gradle/apk_module.gradle         | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/actions/deploy/deploy.sh b/.github/actions/deploy/deploy.sh
index e4c70ac86..6408123b9 100755
--- a/.github/actions/deploy/deploy.sh
+++ b/.github/actions/deploy/deploy.sh
@@ -68,7 +68,7 @@ stat /tmp/anysoftkeyboard.keystore
 wget --tries=5 --waitretry=5 "${PUBLISH_CERT_FILE_URL}" -q -O /tmp/apk_upload_key.p12
 stat /tmp/apk_upload_key.p12
 
-DEPLOY_TASKS=( "-PwithAutoVersioning" ":generateFdroidYamls" "-DdeployChannel=${DEPLOY_CHANNEL}" "--user-fraction" "${FRACTION}" )
+DEPLOY_TASKS=( "-PwithAutoVersioning" ":generateFdroidYamls" "-DdeployChannel=${DEPLOY_CHANNEL}" "-DdeployFraction=${FRACTION}" )
 if [[ "${DEPLOYMENT_TASK}" == "deploy" ]]; then
   case "${PROCESS_NAME}" in
 
diff --git a/gradle/apk_module.gradle b/gradle/apk_module.gradle
index 6521b2946..e0f944bc7 100644
--- a/gradle/apk_module.gradle
+++ b/gradle/apk_module.gradle
@@ -80,8 +80,14 @@ if (project.ext.shouldBePublished) {
 
     play {
         // you can promote from command-line by specifying the track to promote to:
-        // ./gradlew promoteReleaseArtifact -DdeployChannel=beta
+        // ./gradlew promoteReleaseArtifact -DdeployChannel=beta -DdeployFraction=1.00
         track = System.getProperty('deployChannel', 'alpha')
+        userFraction = Double.parseDouble(System.getProperty('deployFraction', '1.0')).doubleValue()
+        if (userFraction < 1.0) {
+            releaseStatus = 'inProgress'
+        } else {
+            releaseStatus = 'completed'
+        }
         serviceAccountEmail = System.getenv().getOrDefault('PUBLISH_APK_SERVICE_ACCOUNT_EMAIL', 'dummy@example.com')
         serviceAccountCredentials = file('/tmp/apk_upload_key.p12')
     }
-- 
cgit v1.2.3