Merge pull request #36 from kiwix/deps_through_http

Deps through http
This commit is contained in:
Matthieu Gautier 2017-04-18 13:29:46 +02:00 committed by GitHub
commit e7377e2e86
2 changed files with 14 additions and 13 deletions

View File

@ -3,9 +3,9 @@
set -e set -e
BASE_DIR="BUILD_${PLATFORM}" BASE_DIR="BUILD_${PLATFORM}"
DEPS_ARCHIVES_DIR=${HOME}/DEPS_ARCHIVES
mkdir -p ${DEPS_ARCHIVES_DIR}
NIGHTLY_ARCHIVES_DIR=${HOME}/NIGHTLY_ARCHIVES NIGHTLY_ARCHIVES_DIR=${HOME}/NIGHTLY_ARCHIVES
SSH_KEY=travis/travisci_builder_id_key
mkdir -p ${NIGHTLY_ARCHIVES_DIR} mkdir -p ${NIGHTLY_ARCHIVES_DIR}
cd ${HOME} cd ${HOME}
@ -35,7 +35,18 @@ then
MESON_FILE=meson_cross_file.txt MESON_FILE=meson_cross_file.txt
fi fi
ANDROID_NDK_DIR=$(find . -name "android-ndk*") ANDROID_NDK_DIR=$(find . -name "android-ndk*")
tar -czf "${DEPS_ARCHIVES_DIR}/deps_${PLATFORM}_${TARGET}.tar.gz" INSTALL ${MESON_FILE} ${ANDROID_NDK_DIR} ARCHIVE_NAME="deps_${PLATFORM}_${TARGET}.tar.gz"
cat <<EOF > manifest.txt
${ARCHIVE_NAME}
*********************************
Dependencies archive for ${TARGET} on platform ${PLATFORM}
Generated at $(date)
EOF
tar -czf ${ARCHIVE_NAME} INSTALL manifest.txt ${MESON_FILE} ${ANDROID_NDK_DIR}
scp -i ${SSH_KEY} ${ARCHIVE_NAME} nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/
) )
${TRAVIS_BUILD_DIR}/kiwix-build.py --target-platform $PLATFORM ${TARGET} ${TRAVIS_BUILD_DIR}/kiwix-build.py --target-platform $PLATFORM ${TARGET}

View File

@ -2,19 +2,9 @@
set -e set -e
DEPS_ARCHIVES_DIR=${HOME}/DEPS_ARCHIVES
NIGHTLY_ARCHIVES_DIR=${HOME}/NIGHTLY_ARCHIVES NIGHTLY_ARCHIVES_DIR=${HOME}/NIGHTLY_ARCHIVES
SSH_KEY=travis/travisci_builder_id_key SSH_KEY=travis/travisci_builder_id_key
DEPS_ARCHIVES=$(find $DEPS_ARCHIVES_DIR -type f)
if [[ "x$DEPS_ARCHIVES" != "x" ]]
then
scp -vp -i ${SSH_KEY} \
${DEPS_ARCHIVES} \
nightlybot@download.kiwix.org:~/travis_deps/
fi
NIGHTLY_ARCHIVES=$(find $NIGHTLY_ARCHIVES_DIR -type f) NIGHTLY_ARCHIVES=$(find $NIGHTLY_ARCHIVES_DIR -type f)
if [[ "x$NIGHTLY_ARCHIVES" != "x" ]] if [[ "x$NIGHTLY_ARCHIVES" != "x" ]]
then then