From 152cd982a89b6b70dbeaa3ae0297f1882985cdff Mon Sep 17 00:00:00 2001 From: Pierre Grandin Date: Sun, 22 Apr 2018 19:22:35 -0700 Subject: Updated publish.sh --- ci/publish.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ci/publish.sh b/ci/publish.sh index 58c3c05d5..4e59dd213 100644 --- a/ci/publish.sh +++ b/ci/publish.sh @@ -2,19 +2,22 @@ set -e ARCH="arm" +BINPATH="android-arm/navit/android/bin" + +export PATH="/opt/android-sdk-linux/build-tools/25.0.1/":$PATH cd ~/ git clone git@github.com:navit-gps/infrastructure-blackbox.git cd infrastructure-blackbox/keyrings/ openssl aes-256-cbc -d -in keystore.gpg -k $KEY > ~/.keystore -openssl aes-256-cbc -d -in client_secrets.gpg -k $KEY > ~/navit/ci/client_secrets.json -openssl aes-256-cbc -d -in androidpublisher.gpg -k $KEY > androidpublisher.dat +openssl aes-256-cbc -d -in client_secrets.gpg -k $KEY > /root/project/ci/client_secrets.json +openssl aes-256-cbc -d -in androidpublisher.gpg -k $KEY > /root/project/androidpublisher.dat +cd ~/project pip install google-api-python-client -jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $SP $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $key_name +jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $SP $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $key_name -/usr/local/android-sdk-linux/build-tools/25.0.1/zipalign 4 $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk -# /usr/local/android-sdk-linux/build-tools/25.0.1/apksigner sign -v --ks-pass pass:$SP --key $key_name $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk -/usr/local/android-sdk-linux/build-tools/25.0.1/apksigner verify -v $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk -python ~/navit/ci/basic_upload_apks.py org.navitproject.navit $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk +zipalign 4 $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk +apksigner verify -v $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk +python ~/project/ci/basic_upload_apks.py org.navitproject.navit $BINPATH/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk --noauth_local_webserver -- cgit v1.2.1