From 82e9c369308a3fce89914002f064c53b36352765 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Tue, 9 Aug 2022 07:15:22 +0000
Subject: [PATCH] Revert "ci: remove android build and release"

This reverts commit 7c2f8bea3b4c28d5cff65f79ce8c0e5fe4a2ceb6.
---
 package.json               | 2 +-
 scripts/release-version.sh | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index f9a1a962c..26a11874a 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "release-mac": "npm run build-no-pdf && npm run release-mac-nocompile",
     "release-windows-nocompile": "npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" --win",
     "release-windows": "npm run build-no-pdf && npm run release-windows-nocompile",
-    "release-all": "node scripts/clean_release.js && npm run build-no-pdf && npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" && \"node_modules/.bin/electron-builder\" --mac && \"node_modules/.bin/electron-builder\" --win",
+    "release-all": "node scripts/clean_release.js && npm run build-no-pdf && npm run update-dist-index-mimetypes && \"node_modules/.bin/electron-builder\" && \"node_modules/.bin/electron-builder\" --mac && \"node_modules/.bin/electron-builder\" --win && npm run release-android",
     "compodoc": "node \"node_modules/@compodoc/compodoc/bin/index-cli.js\" -p src/tsconfig.app.json -s --language fr-FR -d compodoc-fr",
     "viz": "tsviz -recursive src/ nghyd_class_diagram.png"
   },
diff --git a/scripts/release-version.sh b/scripts/release-version.sh
index f8eceb83f..717cb8d87 100755
--- a/scripts/release-version.sh
+++ b/scripts/release-version.sh
@@ -51,7 +51,8 @@ if (( $update_latest )); then
     echo -e "\t\"$VERSION\": {
 \t\t\"darwin\": \"Cassiopée-${VERSION}-mac.zip\",
 \t\t\"linux\": \"fr.irstea.cassiopee_${VERSION}_amd64.deb\",
-\t\t\"win32\": \"Cassiopée Setup $VERSION.exe\"
+\t\t\"win32\": \"Cassiopée Setup $VERSION.exe\",
+\t\t\"android\": \"cassiopee-$VERSION.apk\"
 \t}," > releases_patch.tmp
 
     sed -i "/\"latest\": \"$VERSION\",/r releases_patch.tmp" "$TMP_RELEASES_FILE"
@@ -69,8 +70,9 @@ if [[ $VERSION == nightly ]]; then
   find release -name "fr.irstea.cassiopee_*.deb" -exec scp "{}" $HOST_LOGIN:$RELEASES_DIR/linux-nightly.deb \;
   find release -name "Cassio*Setup*.exe" -exec scp "{}" $HOST_LOGIN:$RELEASES_DIR/windows-nightly.exe \;
   find release -name "Cassio*-mac.zip" -exec scp "{}" $HOST_LOGIN:$RELEASES_DIR/macos-nightly.zip \;
+  find release -name "cassiopee-*.apk" -exec scp "{}" $HOST_LOGIN:$RELEASES_DIR/android-nightly.apk \;
 else
-  scp "release/Cassiopée Setup $VERSION.exe" "release/fr.irstea.cassiopee_${VERSION}_amd64.deb" "release/Cassiopée-${VERSION}-mac.zip" "$HOST_LOGIN:$RELEASES_DIR/"
+  scp "release/Cassiopée Setup $VERSION.exe" "release/fr.irstea.cassiopee_${VERSION}_amd64.deb" "release/cassiopee-$VERSION.apk" "release/Cassiopée-${VERSION}-mac.zip" "$HOST_LOGIN:$RELEASES_DIR/"
 fi
 
 # symlink "latest" version for each platform
@@ -83,5 +85,6 @@ if (( $update_latest )); then
     ln -sf "Cassiopée Setup $VERSION.exe" "windows-latest.exe"
     ln -sf "fr.irstea.cassiopee_${VERSION}_amd64.deb" "linux-latest.deb"
     ln -sf "Cassiopée-${VERSION}-mac.zip" "macos-latest.zip"
+    ln -sf "cassiopee-$VERSION.apk" "android-latest.apk"
 EOF
 fi
-- 
GitLab