Deploy both variants to snapshot directory (#914)

* Deploy both free and non-free variants

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: add product flavor to APK name

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-07-02 23:53:31 +05:30 committed by GitHub
parent ca9c951a53
commit 9fb492b572
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

View file

@ -51,7 +51,7 @@ jobs:
run: ./gradlew dependencies
- name: Build release app
run: ./gradlew :app:assembleFreeRelease
run: ./gradlew :app:assembleFreeRelease :app:assembleNonFreeRelease
env:
SNAPSHOT: "true"
@ -76,6 +76,8 @@ jobs:
run: npm install -g cloudflare-cli
- name: Purge Cloudflare cache
run: cfcli --token ${CF_TOKEN} purge "https://dl.msfjarvis.dev/APS/$(cd ./app/build/outputs/apk/release/; ls *.apk)"
run: |
cfcli --token ${CF_TOKEN} purge "https://dl.msfjarvis.dev/APS/$(cd ./app/build/outputs/apk/nonFree/release/; ls *.apk)"
cfcli --token ${CF_TOKEN} purge "https://dl.msfjarvis.dev/APS/$(cd ./app/build/outputs/apk/free/release/; ls *.apk)"
env:
CF_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

View file

@ -16,7 +16,7 @@ android {
if (isSnapshot()) {
android.applicationVariants.all { final variant ->
variant.outputs.all {
outputFileName = "aps_${defaultConfig.versionName}.apk"
outputFileName = "aps-${variant.getFlavorName()}_${defaultConfig.versionName}.apk"
}
}
}

View file

@ -5,7 +5,9 @@ mkdir -p "$SSHDIR"
echo "$ACTIONS_DEPLOY_KEY" > "$SSHDIR/key"
chmod 600 "$SSHDIR/key"
export SERVER_DEPLOY_STRING="$SSH_USERNAME@$SERVER_ADDRESS:$SERVER_DESTINATION"
cd "$GITHUB_WORKSPACE/app/build/outputs/apk/free/release"
rm output.json
mkdir -p "$GITHUB_WORKSPACE/APS"
cp -v "$GITHUB_WORKSPACE/app/build/outputs/apk/free/release/*.apk" "$GITHUB_WORKSPACE/APS"
cp -v "$GITHUB_WORKSPACE/app/build/outputs/apk/nonFree/release/*.apk" "$GITHUB_WORKSPACE/APS"
cd "$GITHUB_WORKSPACE/APS"
rsync -ahvcr --omit-dir-times --progress --delete --no-o --no-g -e "ssh -i $SSHDIR/key -o StrictHostKeyChecking=no -p $SSH_PORT" . "$SERVER_DEPLOY_STRING" || exit 1
exit 0