fix: чистить /tmp/apk-out перед подписью; брать свежайший APK

This commit is contained in:
2026-08-21 17:05:20 +00:00
parent 372abd02ad
commit 5f541533da
+2 -1
View File
@@ -24,6 +24,7 @@ runs:
export KEY_ALIAS="${{ vars.ANDROID_KEY_ALIAS }}" export KEY_ALIAS="${{ vars.ANDROID_KEY_ALIAS }}"
export KEY_PASS="${{ vars.ANDROID_KEY_PASSWORD }}" export KEY_PASS="${{ vars.ANDROID_KEY_PASSWORD }}"
echo "Signing ${{ inputs.apk_path }}" echo "Signing ${{ inputs.apk_path }}"
rm -f /tmp/apk-out/*.apk
echo "$KEYSTORE_B64" | base64 -d > /tmp/release.keystore echo "$KEYSTORE_B64" | base64 -d > /tmp/release.keystore
curl -sL -o /tmp/uber-apk-signer.jar \ curl -sL -o /tmp/uber-apk-signer.jar \
https://github.com/patrickfav/uber-apk-signer/releases/download/v1.3.0/uber-apk-signer-1.3.0.jar https://github.com/patrickfav/uber-apk-signer/releases/download/v1.3.0/uber-apk-signer-1.3.0.jar
@@ -47,7 +48,7 @@ runs:
export FROID_SSH_KEY="${{ vars.FROID_SSH_KEY }}" export FROID_SSH_KEY="${{ vars.FROID_SSH_KEY }}"
mkdir -p ~/.ssh && chmod 700 ~/.ssh mkdir -p ~/.ssh && chmod 700 ~/.ssh
echo "$FROID_SSH_KEY" > ~/.ssh/froid_ci && chmod 600 ~/.ssh/froid_ci echo "$FROID_SSH_KEY" > ~/.ssh/froid_ci && chmod 600 ~/.ssh/froid_ci
APK=$(ls /tmp/apk-out/*.apk | head -1) APK=$(ls -t /tmp/apk-out/*.apk | head -1)
echo "Uploading $(basename "$APK") to ${FROID_SSH_USER}@${FROID_HOST}:/opt/fdroid/repo/" echo "Uploading $(basename "$APK") to ${FROID_SSH_USER}@${FROID_HOST}:/opt/fdroid/repo/"
scp -i ~/.ssh/froid_ci -o StrictHostKeyChecking=accept-new "$APK" \ scp -i ~/.ssh/froid_ci -o StrictHostKeyChecking=accept-new "$APK" \
"${FROID_SSH_USER}@${FROID_HOST}:/opt/fdroid/repo/" "${FROID_SSH_USER}@${FROID_HOST}:/opt/fdroid/repo/"