diff --git a/.travis.yml b/.travis.yml index f6f924f..a5f07ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ script: else docker build -t kiwix/build -f travis/Dockerfile . 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 if [[ $TRAVIS_OS_NAME = "linux" ]] then diff --git a/travis/Dockerfile b/travis/Dockerfile index 59561ea..85f3cb4 100644 --- a/travis/Dockerfile +++ b/travis/Dockerfile @@ -72,7 +72,7 @@ COPY . kiwix-build/ RUN sudo chown -R travis:travis /home/travis/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 CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh diff --git a/travis/Dockerfile_flatpak b/travis/Dockerfile_flatpak index 8518e8c..36636b9 100644 --- a/travis/Dockerfile_flatpak +++ b/travis/Dockerfile_flatpak @@ -57,7 +57,7 @@ COPY . kiwix-build/ RUN sudo chown -R travis:travis /home/travis/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 CMD kiwix-build/travis/compile_all.py && kiwix-build/travis/deploy.sh diff --git a/travis/compile_all.py b/travis/compile_all.py index 543ce91..f8c1845 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -34,10 +34,7 @@ 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' -if 'TRAVISCI_SSH_KEY' in environ: - SSH_KEY = Path(environ['TRAVISCI_SSH_KEY']) -else: - SSH_KEY = KBUILD_SOURCE_DIR/'travis'/'travisci_builder_id_key' +SSH_KEY = KBUILD_SOURCE_DIR/'travis'/'travisci_builder_id_key' BIN_EXT = '.exe' if PLATFORM.startswith('win-') else ''