Skip to content

Commit a3e7bbe

Browse files
committed
feat(core): add status for release
1 parent 0b2de6b commit a3e7bbe

File tree

10 files changed

+47
-11
lines changed

10 files changed

+47
-11
lines changed

Diff for: action.yml

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ inputs:
3838
description: 'Do not send changes for review'
3939
required: false
4040
default: 'false'
41+
status:
42+
description: 'The status of a release'
43+
required: false
44+
default: 'draft'
4145

4246
runs:
4347
using: 'docker'
@@ -53,3 +57,4 @@ runs:
5357
- ${{ inputs.path-to-bundle }}
5458
- ${{ inputs.path-to-mapping }}
5559
- ${{ inputs.changes-not-sent-for-review }}
60+
- ${{ inputs.status }}

Diff for: github-action/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/vacxe/google-play-cli:0.4.0
1+
FROM ghcr.io/vacxe/google-play-cli:0.4.1
22

33
COPY entrypoint.sh /entrypoint.sh
44
COPY templates /templates

Diff for: github-action/entrypoint.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ PATH_TO_BUNDLE=${8}
2525
PATH_TO_MAPPING=${9}
2626

2727
FLAG_CHANGES_NOT_SENT_FOR_REVIEW=${10}
28+
STATUS=${11}
2829

2930
echo "Play console version:"
3031
google-play-cli version
@@ -43,15 +44,15 @@ case $TEMPLATE in
4344
checkParameter "Version code" "$VERSION_CODE"
4445
checkParameter "Path to apk" "$PATH_TO_APK"
4546

46-
sh /templates/apk-upload.sh "$SERVICE_ACCOUNT_JSON" "$PACKAGE_NAME" "$PATH_TO_APK" "$VERSION_CODE" "$TRACK" "$FLAG_CHANGES_NOT_SENT_FOR_REVIEW"
47+
sh /templates/apk-upload.sh "$SERVICE_ACCOUNT_JSON" "$PACKAGE_NAME" "$PATH_TO_APK" "$VERSION_CODE" "$TRACK" "$FLAG_CHANGES_NOT_SENT_FOR_REVIEW" "$STATUS"
4748
;;
4849

4950
"bundles-upload")
5051
checkParameter "Package name" "$PACKAGE_NAME"
5152
checkParameter "Version code" "$VERSION_CODE"
5253
checkParameter "Path to bundle" "$PATH_TO_BUNDLE"
5354

54-
sh /templates/bundles-upload.sh "$SERVICE_ACCOUNT_JSON" "$PACKAGE_NAME" "$PATH_TO_BUNDLE" "$VERSION_CODE" "$TRACK" "$FLAG_CHANGES_NOT_SENT_FOR_REVIEW"
55+
sh /templates/bundles-upload.sh "$SERVICE_ACCOUNT_JSON" "$PACKAGE_NAME" "$PATH_TO_BUNDLE" "$VERSION_CODE" "$TRACK" "$FLAG_CHANGES_NOT_SENT_FOR_REVIEW" "$STATUS"
5556
;;
5657

5758
"deobfuscation-files-upload")

Diff for: github-action/templates/apk-upload.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ PACKAGE_NAME=$2
77
PATH_TO_APK=$3
88
VERSION_CODE=$4
99
TRACK=$5
10-
FLAG_CHANGES_NOT_SENT_FOR_REVIEW=$5
10+
FLAG_CHANGES_NOT_SENT_FOR_REVIEW=$6
11+
STATUS="${7}"
1112

1213
echo "---"
1314
echo "Package name: $PACKAGE_NAME"
@@ -25,7 +26,7 @@ echo "Edit id created: $EDIT_ID"
2526
echo "Upload APK..."
2627
google-play-cli apk upload --config-content "$SERVICE_ACCOUNT_JSON" --edit-id "$EDIT_ID" --apk "$PATH_TO_APK"
2728
echo "Update track..."
28-
google-play-cli tracks update --edit-id "$EDIT_ID" --track "$TRACK" --apk-version-code "$VERSION_CODE"
29+
google-play-cli tracks update --edit-id "$EDIT_ID" --track "$TRACK" --apk-version-code "$VERSION_CODE" --status "$STATUS"
2930
echo "Validate..."
3031
google-play-cli edit validate --edit-id "$EDIT_ID"
3132
echo "Commit..."

Diff for: github-action/templates/bundles-upload.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PATH_TO_BUNDLE="${3}"
88
VERSION_CODE="${4}"
99
TRACK="${5}"
1010
FLAG_CHANGES_NOT_SENT_FOR_REVIEW="${6}"
11+
STATUS="${7}"
1112

1213
export PLAYSTORE_SERVICE_ACCOUNT_JSON_CONTENT="$SERVICE_ACCOUNT_JSON"
1314
export APP_PACKAGE_NAME="$PACKAGE_NAME"
@@ -25,7 +26,7 @@ echo "Edit id created: $EDIT_ID"
2526
echo "Upload Bundle..."
2627
google-play-cli bundles upload --edit-id "$EDIT_ID" --package-name "$PACKAGE_NAME" --bundle "$PATH_TO_BUNDLE"
2728
echo "Update track..."
28-
google-play-cli tracks update --edit-id "$EDIT_ID" --package-name "$PACKAGE_NAME" --track "$TRACK" --apk-version-code "$VERSION_CODE"
29+
google-play-cli tracks update --edit-id "$EDIT_ID" --package-name "$PACKAGE_NAME" --track "$TRACK" --apk-version-code "$VERSION_CODE" --status "$STATUS"
2930
echo "Validate..."
3031
google-play-cli edit validate --edit-id "$EDIT_ID" --package-name "$PACKAGE_NAME"
3132
echo "Commit..."

Diff for: src/main/kotlin/com/github/vacxe/googleplaycli/Commands.kt

+24-1
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,24 @@ object Commands {
615615
help = "Fraction of users who are eligible to receive the release. 0 < fraction < 1. To be set, release status must be \"inProgress\" or \"halted\"."
616616
).double().default(1.0)
617617

618+
private val status: String by option(
619+
"--status",
620+
"-s",
621+
help = ""
622+
).choice("statusUnspecified", "draft", "inProgress", "halted", "completed").default("draft")
623+
618624
override fun run(api: PlayStoreApi) =
619-
api.tracksPatch(TracksPatchModel(packageName, editId, track, apkVersionCode, userFraction, parameters))
625+
api.tracksPatch(
626+
TracksPatchModel(
627+
packageName,
628+
editId,
629+
track,
630+
apkVersionCode,
631+
userFraction,
632+
status,
633+
parameters
634+
)
635+
)
620636
}
621637

622638
class Update : EditCommand(
@@ -635,13 +651,20 @@ object Commands {
635651
help = "Fraction of users who are eligible to receive the release. 0 < fraction < 1. To be set, release status must be \"inProgress\" or \"halted\"."
636652
).double().default(1.0)
637653

654+
private val status: String by option(
655+
"--status",
656+
"-s",
657+
help = ""
658+
).choice("statusUnspecified", "draft", "inProgress", "halted", "completed").default("draft")
659+
638660
override fun run(api: PlayStoreApi) = api.tracksUpdate(
639661
TracksUpdateModel(
640662
packageName,
641663
editId,
642664
track,
643665
apkVersionCode,
644666
userFraction,
667+
status,
645668
parameters
646669
)
647670
)

Diff for: src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fun main(args: Array<String>) {
8686
addCmd {
8787
object : CliktCommand(name = "version", help = "Library version code") {
8888
override fun run() {
89-
println("0.4.0")
89+
println("0.4.1")
9090
}
9191
}
9292
}

Diff for: src/main/kotlin/com/github/vacxe/googleplaycli/actions/Tracks.kt

+6-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ interface Tracks : BaseAction {
4242
listOf(TrackRelease().apply {
4343
versionCodes = mutableListOf(model.apkVersionCode.toLong())
4444
userFraction = model.userFraction
45+
status = model.status
4546
})
4647
)
4748
return edits
@@ -57,9 +58,11 @@ interface Tracks : BaseAction {
5758
val edits: AndroidPublisher.Edits = androidPublisher.edits()
5859
val editId = model.editId ?: edits.insert(model.packageName, null).execute().id
5960

60-
val release = TrackRelease()
61-
.setVersionCodes(listOf(model.apkVersionCode.toLong()))
62-
.setStatus("completed")
61+
val release = TrackRelease().apply {
62+
versionCodes = mutableListOf(model.apkVersionCode.toLong())
63+
userFraction = model.userFraction
64+
status = model.status
65+
}
6366

6467
val track = Track().setReleases(listOf(release))
6568

Diff for: src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/TracksPatchModel.kt

+1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ class TracksPatchModel(val packageName: String,
55
val track: String,
66
val apkVersionCode: Int,
77
val userFraction: Double,
8+
val status: String,
89
requestParameters: String?
910
): RequestModel(requestParameters)

Diff for: src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/TracksUpdateModel.kt

+1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ class TracksUpdateModel(
66
val track: String,
77
val apkVersionCode: Int,
88
val userFraction: Double,
9+
val status: String,
910
requestParameters: String?
1011
) : RequestModel(requestParameters)

0 commit comments

Comments
 (0)