From df99696c85f8ebeb13b5641a5558575c3d10f281 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 18 Apr 2018 09:52:37 +0200
Subject: [PATCH 1/2] Publish nightly and release archive using the right name.

The names of archives were inconsistent, rename them to a more consistent
scheme.
---
 travis/compile_all.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/travis/compile_all.py b/travis/compile_all.py
index 8e12328..15d38f6 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -259,13 +259,13 @@ if make_release and PLATFORM == 'native_dyn':
             shutil.copy(str(in_file), str(out_dir/target))
 elif PLATFORM == 'native_static':
     for target in ('kiwix-tools', 'zim-tools', 'zimwriterfs'):
-        make_archive(target, 'linux64')
+        make_archive(target, 'linux-x86_64')
 elif PLATFORM == 'win32_static':
-    make_archive('kiwix-tools', 'win32')
+    make_archive('kiwix-tools', 'win-i686')
 elif PLATFORM == 'armhf_static':
-    make_archive('kiwix-tools', 'armhf')
+    make_archive('kiwix-tools', 'linux-armhf')
 elif PLATFORM == 'i586_static':
-    make_archive('kiwix-tools', 'i586')
+    make_archive('kiwix-tools', 'linux-i586')
 elif PLATFORM.startswith('android_') and 'kiwix-android' in TARGETS:
     APK_NAME = "kiwix-{}".format(PLATFORM)
     source_debug_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'debug'

From 989889ca4499f9fb190f45f1aa3657ea86d7c99b Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 23 Apr 2018 13:58:11 +0200
Subject: [PATCH 2/2] Deploy zim nightly on the right server.

zim related projects should be deployed on zim server, not kiwix.

Fix #156.
---
 travis/compile_all.py | 15 ++++++++++-----
 travis/deploy.sh      | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/travis/compile_all.py b/travis/compile_all.py
index 15d38f6..6b67aab 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -23,8 +23,9 @@ BASE_DIR = home()/"BUILD_{}".format(PLATFORM)
 SOURCE_DIR = home()/"SOURCE"
 ARCHIVE_DIR = home()/"ARCHIVE"
 TOOLCHAINS_DIR = home()/"TOOLCHAINS"
-NIGHTLY_ARCHIVES_DIR = home()/'NIGHTLY_ARCHIVES'
+NIGHTLY_KIWIX_ARCHIVES_DIR = home()/'NIGHTLY_KIWIX_ARCHIVES'
 RELEASE_KIWIX_ARCHIVES_DIR = home()/'RELEASE_KIWIX_ARCHIVES'
+NIGHTLY_ZIM_ARCHIVES_DIR = home()/'NIGHTLY_ZIM_ARCHIVES'
 RELEASE_ZIM_ARCHIVES_DIR = home()/'RELEASE_ZIM_ARCHIVES'
 DIST_KIWIX_ARCHIVES_DIR = home()/'DIST_KIWIX_ARCHIVES'
 DIST_ZIM_ARCHIVES_DIR = home()/'DIST_ZIM_ARCHIVES'
@@ -84,7 +85,10 @@ def make_archive(project, platform):
             archive_dir = RELEASE_ZIM_ARCHIVES_DIR/project
     else:
         postfix = _date
-        archive_dir = NIGHTLY_ARCHIVES_DIR
+        if project in ('kiwix-lib', 'kiwix-tools'):
+            archive_dir = NIGHTLY_KIWIX_ARCHIVES_DIR
+        else:
+            archive_dir = NIGHTLY_ZIM_ARCHIVES_DIR
 
     try:
         archive_dir.mkdir(parents=True)
@@ -148,7 +152,8 @@ def scp(what, where):
     subprocess.check_call(command)
 
 
-for p in (NIGHTLY_ARCHIVES_DIR,
+for p in (NIGHTLY_KIWIX_ARCHIVES_DIR,
+          NIGHTLY_ZIM_ARCHIVES_DIR,
           RELEASE_KIWIX_ARCHIVES_DIR,
           RELEASE_ZIM_ARCHIVES_DIR,
           DIST_KIWIX_ARCHIVES_DIR,
@@ -271,7 +276,7 @@ elif PLATFORM.startswith('android_') and 'kiwix-android' in TARGETS:
     source_debug_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'debug'
     source_release_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'release'
     shutil.copy(str(source_debug_dir/'app-kiwix-debug.apk'),
-                str(NIGHTLY_ARCHIVES_DIR/"{}-debug.apk".format(APK_NAME)))
+                str(NIGHTLY_KIWIX_ARCHIVES_DIR/"{}-debug.apk".format(APK_NAME)))
     shutil.copy(str(source_release_dir/'app-kiwix-release-unsigned.apk'),
-                str(NIGHTLY_ARCHIVES_DIR/"{}-release_signed".format(APK_NAME)))
+                str(NIGHTLY_KIWIX_ARCHIVES_DIR/"{}-release_signed".format(APK_NAME)))
 
diff --git a/travis/deploy.sh b/travis/deploy.sh
index 2d9ef59..f2d28bf 100755
--- a/travis/deploy.sh
+++ b/travis/deploy.sh
@@ -2,7 +2,8 @@
 
 set -e
 
-NIGHTLY_ARCHIVES_DIR=${HOME}/NIGHTLY_ARCHIVES
+NIGHTLY_KIWIX_ARCHIVES_DIR=${HOME}/NIGHTLY_KIWIX_ARCHIVES
+NIGHTLY_ZIM_ARCHIVES_DIR=${HOME}/NIGHTLY_ZIM_ARCHIVES
 RELEASE_KIWIX_ARCHIVES_DIR=${HOME}/RELEASE_KIWIX_ARCHIVES
 RELEASE_ZIM_ARCHIVES_DIR=${HOME}/RELEASE_ZIM_ARCHIVES
 DIST_KIWIX_ARCHIVES_DIR=${HOME}/DIST_KIWIX_ARCHIVES
@@ -11,13 +12,22 @@ SSH_KEY=travis/travisci_builder_id_key
 
 if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]
 then
-  NIGHTLY_ARCHIVES=$(find $NIGHTLY_ARCHIVES_DIR -type f)
+  NIGHTLY_ARCHIVES=$(find $NIGHTLY_KIWIX_ARCHIVES_DIR -type f)
   if [[ "x$NIGHTLY_ARCHIVES" != "x" ]]
   then
     scp -vrp -i ${SSH_KEY} \
       ${NIGHTLY_ARCHIVES} \
       nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/$(date +%Y-%m-%d)
   fi
+
+  NIGHTLY_ARCHIVES=$(find $NIGHTLY_ZIM_ARCHIVES_DIR -type f)
+  if [[ "x$NIGHTLY_ARCHIVES" != "x" ]]
+  then
+    scp -vrp -i ${SSH_KEY} \
+      ${NIGHTLY_ARCHIVES} \
+      nightlybot@download.kiwix.org:/var/www/download.openzim.org/nightly/$(date +%Y-%m-%d)
+  fi
+
 elif [[ "x$TRAVIS_TAG" != "x" ]]
 then
   RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)