taler-android

commit 19e9dbb7b4414ec0ea6bdb80f22a64d8af5d0038
parent 21c11769a8ab800077173667dcbcc3d987459bb1
Author: Iván Ávalos <avalos@disroot.org>
Date:   Mon,  1 Jul 2024 12:00:50 -0600

[ci] Sign APKs with apksigner instead of jarsigner

Diffstat:
M
contrib/ci/Containerfile
 | 
2
++
M
contrib/ci/jobs/1-wallet-deploy/deploy.sh
 | 
8
+++++---
M
contrib/ci/jobs/2-cashier-deploy/deploy.sh
 | 
8
+++++---
M
contrib/ci/jobs/3-merchant-terminal-deploy/deploy.sh
 | 
8
+++++---

4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -21,4 +21,6 @@ ENV SCP_SSH_KEY  /inputs/wallet.taler.net
 ENV SCP_SSH_HOST avalos@gv.taler.net
 ENV SCP_SSH_PATH /var/www/files
 
+RUN ln -s $ANDROID_HOME/build-tools/32.0.0/apksigner /usr/bin/
+
 WORKDIR /workdir
diff --git a/contrib/ci/jobs/1-wallet-deploy/deploy.sh b/contrib/ci/jobs/1-wallet-deploy/deploy.sh
@@ -14,9 +14,11 @@ function build_apk {
     ./gradlew :wallet:check :wallet:assembleNightlyRelease
 
     # Sign the APK
-    jarsigner -keystore "${NIGHTLY_KEYSTORE_PATH}" \
-              -storepass "${NIGHTLY_KEYSTORE_PASS}" \
-              "${APK_PATH}" "${NIGHTLY_KEYSTORE_ALIAS}"
+    apksigner sign \
+              --ks "${NIGHTLY_KEYSTORE_PATH}" \
+              --ks-key-alias "${NIGHTLY_KEYSTORE_ALIAS}" \
+              --ks-pass env:NIGHTLY_KEYSTORE_PASS \
+              "${APK_PATH}"
 
     # Copy the APK and lint report to artifacts folder
     mkdir -p "${ARTIFACT_PATH}"
diff --git a/contrib/ci/jobs/2-cashier-deploy/deploy.sh b/contrib/ci/jobs/2-cashier-deploy/deploy.sh
@@ -24,9 +24,11 @@ function build_apk {
     ./gradlew :cashier:check :cashier:assembleRelease
 
     # Sign the APK
-    jarsigner -keystore "${NIGHTLY_KEYSTORE_PATH}" \
-              -storepass "${NIGHTLY_KEYSTORE_PASS}" \
-              "${APK_PATH}" "${NIGHTLY_KEYSTORE_ALIAS}"
+    apksigner sign \
+              --ks "${NIGHTLY_KEYSTORE_PATH}" \
+              --ks-key-alias "${NIGHTLY_KEYSTORE_ALIAS}" \
+              --ks-pass env:NIGHTLY_KEYSTORE_PASS \
+              "${APK_PATH}"
 
     # Copy the APK and lint report to artifacts folder
     mkdir -p "${ARTIFACT_PATH}"
diff --git a/contrib/ci/jobs/3-merchant-terminal-deploy/deploy.sh b/contrib/ci/jobs/3-merchant-terminal-deploy/deploy.sh
@@ -30,9 +30,11 @@ function build_apk {
     ./gradlew :merchant-lib:check :merchant-terminal:check :merchant-terminal:assembleRelease
 
     # Sign the APK
-    jarsigner -keystore "${NIGHTLY_KEYSTORE_PATH}" \
-              -storepass "${NIGHTLY_KEYSTORE_PASS}" \
-              "${APK_PATH}" "${NIGHTLY_KEYSTORE_ALIAS}"
+    apksigner sign \
+              --ks "${NIGHTLY_KEYSTORE_PATH}" \
+              --ks-key-alias "${NIGHTLY_KEYSTORE_ALIAS}" \
+              --ks-pass env:NIGHTLY_KEYSTORE_PASS \
+              "${APK_PATH}"
 
     # Copy the APK and lint reports to artifacts folder
     mkdir -p "${ARTIFACT_PATH_POS}"