aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMenny Even Danan <menny@evendanan.net>2020-03-12 03:52:04 +0000
committerMenny Even Danan <menny@evendanan.net>2020-03-12 03:52:16 +0000
commit9a9414246d34e89dc3305f07da2eadd21ee24aac (patch)
treec89080eefe52546d13cb9dc5c6f3073fa1a58a95
parentc478f019354bc8638b27557afcaac3263137aef2 (diff)
downloadAnySoftKeyboard-9a9414246d34e89dc3305f07da2eadd21ee24aac.tar.gz
AnySoftKeyboard-9a9414246d34e89dc3305f07da2eadd21ee24aac.tar.bz2
fix publish fraction logic in script
-rwxr-xr-x.github/actions/deploy/deploy.sh2
-rw-r--r--gradle/apk_module.gradle8
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')
}