From e031eced7c2ba4074683e54664f99f45f1182d92 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 6 May 2019 14:34:25 +0200 Subject: [PATCH] Fix deployment of release and nightly. Docker image need to copy archive to deploy in the correct directory. --- travis/compile_all.py | 17 +++++++++-------- travis/deploy.sh | 13 +++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/travis/compile_all.py b/travis/compile_all.py index 1c52d75..8a193a4 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -25,17 +25,18 @@ KBUILD_SOURCE_DIR = Path(environ['TRAVIS_BUILD_DIR']) KIWIX_DESKTOP_ONLY = environ.get('DESKTOP_ONLY') == '1' BASE_DIR = HOME/"BUILD_{}".format(PLATFORM) -BASE_EXPORT_DIR = HOME/"EXPORT"/"BASE" -GIT_EXPORT_DIR = HOME/"EXPORT"/"GIT" +EXPORT_DIR = HOME/'EXPORT' +BASE_EXPORT_DIR = EXPORT_DIR/"BASE" +GIT_EXPORT_DIR = EXPORT_DIR/"GIT" SOURCE_DIR = HOME/"SOURCE" ARCHIVE_DIR = HOME/"ARCHIVE" INSTALL_DIR = BASE_DIR/"INSTALL" -NIGHTLY_KIWIX_ARCHIVES_DIR = HOME/'NIGHTLY_KIWIX_ARCHIVES'/NIGHTLY_DATE -RELEASE_KIWIX_ARCHIVES_DIR = HOME/'RELEASE_KIWIX_ARCHIVES' -NIGHTLY_ZIM_ARCHIVES_DIR = HOME/'NIGHTLY_ZIM_ARCHIVES'/NIGHTLY_DATE -RELEASE_ZIM_ARCHIVES_DIR = HOME/'RELEASE_ZIM_ARCHIVES' -DIST_KIWIX_ARCHIVES_DIR = HOME/'DIST_KIWIX_ARCHIVES' -DIST_ZIM_ARCHIVES_DIR = HOME/'DIST_ZIM_ARCHIVES' +NIGHTLY_KIWIX_ARCHIVES_DIR = EXPORT_DIR/'NIGHTLY_KIWIX_ARCHIVES'/NIGHTLY_DATE +RELEASE_KIWIX_ARCHIVES_DIR = EXPORT_DIR/'RELEASE_KIWIX_ARCHIVES' +NIGHTLY_ZIM_ARCHIVES_DIR = EXPORT_DIR/'NIGHTLY_ZIM_ARCHIVES'/NIGHTLY_DATE +RELEASE_ZIM_ARCHIVES_DIR = EXPORT_DIR/'RELEASE_ZIM_ARCHIVES' +DIST_KIWIX_ARCHIVES_DIR = EXPORT_DIR/'DIST_KIWIX_ARCHIVES' +DIST_ZIM_ARCHIVES_DIR = EXPORT_DIR/'DIST_ZIM_ARCHIVES' BIN_EXT = '.exe' if PLATFORM.startswith('win32_') else '' diff --git a/travis/deploy.sh b/travis/deploy.sh index 5809727..2d32044 100755 --- a/travis/deploy.sh +++ b/travis/deploy.sh @@ -2,12 +2,13 @@ set -e -NIGHTLY_KIWIX_ARCHIVES_DIR=${HOME}/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} -NIGHTLY_ZIM_ARCHIVES_DIR=${HOME}/NIGHTLY_ZIM_ARCHIVES/${NIGHTLY_DATE} -RELEASE_KIWIX_ARCHIVES_DIR=${HOME}/RELEASE_KIWIX_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 +EXPORT_DIR=${HOME}/EXPORT +NIGHTLY_KIWIX_ARCHIVES_DIR=${EXPORT_DIR}/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} +NIGHTLY_ZIM_ARCHIVES_DIR=${EXPORT_DIR}/NIGHTLY_ZIM_ARCHIVES/${NIGHTLY_DATE} +RELEASE_KIWIX_ARCHIVES_DIR=${EXPORT_DIR}/RELEASE_KIWIX_ARCHIVES +RELEASE_ZIM_ARCHIVES_DIR=${EXPORT_DIR}/RELEASE_ZIM_ARCHIVES +DIST_KIWIX_ARCHIVES_DIR=${EXPORT_DIR}/DIST_KIWIX_ARCHIVES +DIST_ZIM_ARCHIVES_DIR=${EXPORT_DIR}/DIST_ZIM_ARCHIVES if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]] then