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

Correctly use TRAVIS_BUILD_DIR in docker. 

TRAVIS_BUILD_DIR is the directory of kiwix-build.
So we must correctly set it in docker as the directory is not the
same.
We don't need the TRAVISCI_SSH_KEY now as we are looking in the right
directory.
This commit is contained in:
Matthieu Gautier 2019-02-21 15:05:52 +01:00
parent 3b91babe2f
commit 6200239bba
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -38,7 +38,7 @@ script:
else else
docker build -t kiwix/build -f travis/Dockerfile . docker build -t kiwix/build -f travis/Dockerfile .
fi fi
docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build
else else
if [[ $TRAVIS_OS_NAME = "linux" ]] if [[ $TRAVIS_OS_NAME = "linux" ]]
then then

2
travis/Dockerfile
View File

@ -72,7 +72,7 @@ COPY . kiwix-build/
RUN sudo chown -R travis:travis /home/travis/kiwix-build RUN sudo chown -R travis:travis /home/travis/kiwix-build
RUN pip3 install --user -e kiwix-build RUN pip3 install --user -e kiwix-build
ENV TRAVISCI_SSH_KEY /home/travis/kiwix-build/travis/travisci_builder_id_key ENV TRAVIS_BUILD_DIR /home/travis/kiwix-build
ENV TRAVIS_OS_NAME linux_artful ENV TRAVIS_OS_NAME linux_artful
CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh

2
travis/Dockerfile_flatpak
View File

@ -57,7 +57,7 @@ COPY . kiwix-build/
RUN sudo chown -R travis:travis /home/travis/kiwix-build RUN sudo chown -R travis:travis /home/travis/kiwix-build
RUN pip3 install --user -e kiwix-build RUN pip3 install --user -e kiwix-build
ENV TRAVISCI_SSH_KEY /home/travis/kiwix-build/travis/travisci_builder_id_key ENV TRAVIS_BUILD_DIR /home/travis/kiwix-build
ENV TRAVIS_OS_NAME linux_artful ENV TRAVIS_OS_NAME linux_artful
CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh

5
travis/compile_all.py
View File

@ -34,10 +34,7 @@ NIGHTLY_ZIM_ARCHIVES_DIR = HOME/'NIGHTLY_ZIM_ARCHIVES'/NIGHTLY_DATE
RELEASE_ZIM_ARCHIVES_DIR = HOME/'RELEASE_ZIM_ARCHIVES' RELEASE_ZIM_ARCHIVES_DIR = HOME/'RELEASE_ZIM_ARCHIVES'
DIST_KIWIX_ARCHIVES_DIR = HOME/'DIST_KIWIX_ARCHIVES' DIST_KIWIX_ARCHIVES_DIR = HOME/'DIST_KIWIX_ARCHIVES'
DIST_ZIM_ARCHIVES_DIR = HOME/'DIST_ZIM_ARCHIVES' DIST_ZIM_ARCHIVES_DIR = HOME/'DIST_ZIM_ARCHIVES'
if 'TRAVISCI_SSH_KEY' in environ: SSH_KEY = KBUILD_SOURCE_DIR/'travis'/'travisci_builder_id_key'
SSH_KEY = Path(environ['TRAVISCI_SSH_KEY'])
else:
SSH_KEY = KBUILD_SOURCE_DIR/'travis'/'travisci_builder_id_key'
BIN_EXT = '.exe' if PLATFORM.startswith('win-') else '' BIN_EXT = '.exe' if PLATFORM.startswith('win-') else ''