smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

I forget to fetch before pushing the 0.0.14 tag :/
This commit is contained in:
Matthieu Gautier 2018-11-14 10:59:11 +01:00
parent 054f7802d0 f080c750b6
commit 22f1693335
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor/create_cache.sh
View File

@ -7,5 +7,5 @@ SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR 7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${ARCHIVE_NAME} \ ${ARCHIVE_NAME} \
nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci ci@tmp.kiwix.org:/data/tmp/ci

2
build_custom_app.py
View File

@ -283,7 +283,7 @@ def travis_launch_build(organisation, repository, options, zim_size):
}) })
else: else:
global_env.append({ global_env.append({
'DEPLOY_DIR' : '/var/www/tmp.kiwix.org/custom_apps/{}_{}'.format( 'DEPLOY_DIR' : '/data/tmp/custom_apps/{}_{}'.format(
options.custom_app, options.base_version) options.custom_app, options.base_version)
}) })

4
travis/compile_all.py
View File

@ -273,7 +273,7 @@ except URLError:
run_kiwix_build('alldependencies', platform=PLATFORM) run_kiwix_build('alldependencies', platform=PLATFORM)
if SSH_KEY.exists(): if SSH_KEY.exists():
archive = make_deps_archive('alldependencies', full=True) archive = make_deps_archive('alldependencies', full=True)
destination = 'nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/{}' destination = 'ci@tmp.kiwix.org:/data/tmp/ci/{}'
destination = destination.format(base_dep_archive_name) destination = destination.format(base_dep_archive_name)
scp(archive, destination) scp(archive, destination)
@ -328,7 +328,7 @@ for target in TARGETS:
platform=PLATFORM, platform=PLATFORM,
build_deps_only=True) build_deps_only=True)
archive = make_deps_archive(target) archive = make_deps_archive(target)
scp(archive, 'nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/') scp(archive, 'ci@tmp.kiwix.org:/data/tmp/ci/')
run_kiwix_build(target, run_kiwix_build(target,
platform=PLATFORM, platform=PLATFORM,

6
travis/deploy.sh
View File

@ -17,7 +17,7 @@ then
nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${NIGHTLY_ZIM_ARCHIVES_DIR} \ ${NIGHTLY_ZIM_ARCHIVES_DIR} \
nightlybot@download.kiwix.org:/var/www/download.openzim.org/nightly ci@download.openzim.org:/data/openzim/nightly
elif [[ "x$TRAVIS_TAG" != "x" ]] elif [[ "x$TRAVIS_TAG" != "x" ]]
then then
@ -41,7 +41,7 @@ then
subdir=$(basename $(dirname $archive)) subdir=$(basename $(dirname $archive))
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${archive} \ ${archive} \
nightlybot@download.openzim.org:/var/www/download.openzim.org/release/${subdir} ci@download.openzim.org:/data/openzim/release/${subdir}
done done
fi fi
@ -65,7 +65,7 @@ then
subdir=$(basename $(dirname $archive)) subdir=$(basename $(dirname $archive))
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${archive} \ ${archive} \
nightlybot@download.openzim.org:/var/www/download.openzim.org/release/${subdir} ci@download.openzim.org:/data/openzim/release/${subdir}
done done
fi fi
fi fi

2
travis/upload_all_log.sh
View File

@ -10,4 +10,4 @@ tar -czf fail_log_${PLATFORM}.tar.gz BUILD_${PLATFORM}
scp -vrp -i ${SSH_KEY} \ scp -vrp -i ${SSH_KEY} \
fail_log_${PLATFORM}.tar.gz \ fail_log_${PLATFORM}.tar.gz \
nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci ci@tmp.kiwix.org:/data/tmp/ci