Fix deployement of archive.

The user name in docker is `ci_builder` not `builder`.
This commit is contained in:
Matthieu Gautier 2019-05-27 10:47:27 +02:00
parent 83fa604613
commit def0163dfe
2 changed files with 5 additions and 4 deletions

View File

@ -46,7 +46,7 @@ jobs:
before_install: before_install:
- PATH=$PATH:${HOME}/bin:${HOME}/.local/bin - PATH=$PATH:${HOME}/bin:${HOME}/.local/bin
- mkdir -p /tmp/private $HOME/EXPORT/BASE /$HOME/.cache $HOME/.gradle/caches - 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 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=$PATH:$(brew --prefix)/opt/gettext/bin; fi
- '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc - '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc
-K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv -K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
@ -77,9 +77,9 @@ script:
docker run --rm \ docker run --rm \
-e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e DESKTOP_ONLY -e TRAVIS_TAG \ -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e DESKTOP_ONLY -e TRAVIS_TAG \
--device /dev/fuse --cap-add ALL --privileged \ --device /dev/fuse --cap-add ALL --privileged \
--mount=type=bind,src=$HOME/EXPORT,dst=/home/builder/EXPORT \ --mount=type=bind,src=$HOME/EXPORT,dst=/home/ci_builder/EXPORT \
--mount=type=bind,src=$HOME/.cache,dst=/home/builder/.cache \ --mount=type=bind,src=$HOME/.cache,dst=/home/ci_builder/.cache \
--mount=type=bind,src=$HOME/.gradle/caches,dst=/home/builder/.gradle/caches \ --mount=type=bind,src=$HOME/.gradle/caches,dst=/home/ci_builder/.gradle/caches \
kiwix/kiwix-build_ci:${VARIANT}-${TRAVIS_COMMIT} kiwix/kiwix-build_ci:${VARIANT}-${TRAVIS_COMMIT}
fi fi
- if [[ $TRAVIS_OS_NAME != "linux" ]]; then python3 travis/compile_all.py; fi - if [[ $TRAVIS_OS_NAME != "linux" ]]; then python3 travis/compile_all.py; fi

View File

@ -190,6 +190,7 @@ def make_archive(project, platform):
archive = archive_dir/'{}{}'.format(archive_name, archive_ext) archive = archive_dir/'{}{}'.format(archive_name, archive_ext)
print_message("create archive {} with {}", archive, files_to_archive)
with open_archive(archive) as arch: with open_archive(archive) as arch:
for f in files_to_archive: for f in files_to_archive:
archive_add(arch, f) archive_add(arch, f)