From def0163dfe343e0c589a9402969d32d7f2085f24 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 27 May 2019 10:47:27 +0200
Subject: [PATCH] Fix deployement of archive.

The user name in docker is `ci_builder` not `builder`.
---
 .travis.yml           | 8 ++++----
 travis/compile_all.py | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51107ad..0e55a9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ jobs:
 before_install:
 - PATH=$PATH:${HOME}/bin:${HOME}/.local/bin
 - mkdir -p /tmp/private $HOME/EXPORT/BASE /$HOME/.cache $HOME/.gradle/caches
-- chmod -R a+w $HOME/EXPORT $HOME/.cache $HOME/.gradle
+- chmod -R a+wX $HOME/EXPORT $HOME/.cache $HOME/.gradle
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=$PATH:$(brew --prefix)/opt/gettext/bin; fi
 - '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc
   -K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
@@ -77,9 +77,9 @@ script:
     docker run --rm \
       -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e DESKTOP_ONLY -e TRAVIS_TAG \
       --device /dev/fuse --cap-add ALL --privileged \
-      --mount=type=bind,src=$HOME/EXPORT,dst=/home/builder/EXPORT \
-      --mount=type=bind,src=$HOME/.cache,dst=/home/builder/.cache \
-      --mount=type=bind,src=$HOME/.gradle/caches,dst=/home/builder/.gradle/caches \
+      --mount=type=bind,src=$HOME/EXPORT,dst=/home/ci_builder/EXPORT \
+      --mount=type=bind,src=$HOME/.cache,dst=/home/ci_builder/.cache \
+      --mount=type=bind,src=$HOME/.gradle/caches,dst=/home/ci_builder/.gradle/caches \
       kiwix/kiwix-build_ci:${VARIANT}-${TRAVIS_COMMIT}
   fi
 - if [[ $TRAVIS_OS_NAME != "linux" ]]; then python3 travis/compile_all.py; fi
diff --git a/travis/compile_all.py b/travis/compile_all.py
index 8a193a4..f52988f 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -190,6 +190,7 @@ def make_archive(project, platform):
 
 
     archive = archive_dir/'{}{}'.format(archive_name, archive_ext)
+    print_message("create archive {} with {}", archive, files_to_archive)
     with open_archive(archive) as arch:
         for f in files_to_archive:
             archive_add(arch, f)