diff --git a/docs/release-checklist.md b/docs/release-checklist.md index ab7eb7641..98978f958 100644 --- a/docs/release-checklist.md +++ b/docs/release-checklist.md @@ -32,13 +32,13 @@ in Android Studio: (not: App Bundle as this would require uploading the signing key) b) select flavor `gplayRelease` with V1 signature enabled (needed for easy APK verification), V2 is optional - c) if you want to use upload-testrun.sh, generate a debug apk additionally at + c) if you want to use upload-beta.sh, generate a debug apk additionally at "Build / Build Bundle(s)/APK / Build APK(s)" on success, the generated APK is at `gplay/release/deltachat-gplay-release-VERSION.apk` and can be uploading for testing using: -$ ./scripts/upload-testrun.sh VERSION +$ ./scripts/upload-beta.sh VERSION The "Testing checklist" gives some hints about what should be always tested. diff --git a/scripts/upload-beta.sh b/scripts/upload-beta.sh new file mode 100755 index 000000000..a2f3e6a98 --- /dev/null +++ b/scripts/upload-beta.sh @@ -0,0 +1,34 @@ + +VERSION=$1 + +if [ -z "$VERSION" ]; then + echo "this script uploads test apks to download.delta.chat/android/beta, both flavours:" + echo "- 🍋 gplay (overwrites gplay installs)" + echo "- 🍉 dev (can be installed beside gplay)" + echo "" + echo "usage: ./scripts/upload-beta.sh " + exit +fi +if [[ ${VERSION:0:1} == "v" ]]; then + echo "VERSION must not begin with 'v' here." + exit +fi + +APKGPLAY="gplay/release/deltachat-gplay-release-$VERSION.apk" +APKDEV="build/outputs/apk/fat/debug/deltachat-fat-debug-$VERSION.apk" +ls -l $APKGPLAY +ls -l $APKDEV +read -p "upload these apks to download.delta.chat/android/beta? ENTER to continue, CTRL-C to abort." + +# see docs/upload-release for some hints wrt keys +rsync --progress $APKGPLAY jekyll@download.delta.chat:/var/www/html/download/android/beta/ +rsync --progress $APKDEV jekyll@download.delta.chat:/var/www/html/download/android/beta/ + +echo "upload done." +echo "" +echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:" +echo "- 🍋 https://download.delta.chat/android/beta/deltachat-gplay-release-$VERSION.apk (android, overwrites existing gplay installs, should keep data)" +echo "- 🍉 https://download.delta.chat/android/beta/deltachat-fat-debug-$VERSION.apk (android, can be installed beside gplay)" +echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)" + + diff --git a/scripts/upload-release.sh b/scripts/upload-release.sh index 3cf036fb5..67597aeed 100755 --- a/scripts/upload-release.sh +++ b/scripts/upload-release.sh @@ -2,8 +2,10 @@ VERSION=$1 if [ -z "$VERSION" ]; then - echo "this script uploads apk and symbols to get.delta.chat" - echo "the script does not upload things to gplay or other stores." + echo "this script uploads release-ready apk and symbols to download.delta.chat/android" + echo "- for showing up on get.delta.chat" + echo " you still need to change deltachat-pages/_includes/download-boxes.html" + echo "- the script does not upload things to gplay or other stores." echo "" echo "usage: ./scripts/upload-release.sh " exit @@ -16,7 +18,7 @@ fi cd gplay/release APK="deltachat-gplay-release-$VERSION.apk" ls -l $APK -read -p "upload this apk and belonging symbols to get.delta.chat? ENTER to continue, CTRL-C to abort." +read -p "upload this apk and belonging symbols to download.delta.chat/android? ENTER to continue, CTRL-C to abort." # you need the private SSH key of the jekyll user; you can find it in this file: # https://github.com/hpk42/otf-deltachat/blob/master/secrets/delta.chat diff --git a/scripts/upload-testrun.sh b/scripts/upload-testrun.sh deleted file mode 100755 index da49ac243..000000000 --- a/scripts/upload-testrun.sh +++ /dev/null @@ -1,33 +0,0 @@ - -VERSION=$1 - -if [ -z "$VERSION" ]; then - echo "this script uploads test apks testrun.org, both flavours:" - echo "- 🍋 gplay (overwrites gplay installs)" - echo "- 🍉 dev (can be installed beside gplay)" - echo "" - echo "usage: ./scripts/upload-testrun.sh " - exit -fi -if [[ ${VERSION:0:1} == "v" ]]; then - echo "VERSION must not begin with 'v' here." - exit -fi - -APKGPLAY="gplay/release/deltachat-gplay-release-$VERSION.apk" -APKDEV="build/outputs/apk/fat/debug/deltachat-fat-debug-$VERSION.apk" -ls -l $APKGPLAY -ls -l $APKDEV -read -p "upload these apks to mailadm.testrun.org? ENTER to continue, CTRL-C to abort." - -scp $APKGPLAY root@mailadm.testrun.org:/var/www/testrun.org/ -scp $APKDEV root@mailadm.testrun.org:/var/www/testrun.org/ - -echo "upload done." -echo "" -echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:" -echo "- 🍋 https://mailadm.testrun.org/deltachat-gplay-release-$VERSION.apk (android, overwrites existing gplay installs, should keep data)" -echo "- 🍉 https://mailadm.testrun.org/deltachat-fat-debug-$VERSION.apk (android, can be installed beside gplay)" -echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)" - -