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

Build new version of dependencies (with new compilation option). (#366) 

Build new version of dependencies (with new compilation option).
This commit is contained in:
Matthieu Gautier 2019-09-05 15:15:32 +02:00 committed by GitHub
parent cb77de12ec 3a8151d841
commit 4ef0327271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -70,6 +70,7 @@ script:
then then
VARIANT=xenial VARIANT=xenial
if [[ $DESKTOP_ONLY = 1 ]]; then VARIANT=bionic; fi if [[ $DESKTOP_ONLY = 1 ]]; then VARIANT=bionic; fi
if [[ $PLATFORM =~ ^win32_* ]]; then VARIANT=bionic; fi
fi fi
- | - |
if [[ $TRAVIS_OS_NAME = "linux" ]] if [[ $TRAVIS_OS_NAME = "linux" ]]
@ -106,7 +107,7 @@ env:
global: global:
- NIGHTLY_DATE=$(date +%Y-%m-%d) - NIGHTLY_DATE=$(date +%Y-%m-%d)
- SSH_KEY=/tmp/private/travisci_builder_id_key - SSH_KEY=/tmp/private/travisci_builder_id_key
- DOCKER_VERSION=1 - DOCKER_VERSION=2
matrix: matrix:
- PLATFORM="flatpak" DESKTOP_ONLY=1 - PLATFORM="flatpak" DESKTOP_ONLY=1
- PLATFORM="native_dyn" - PLATFORM="native_dyn"

2
kiwixbuild/versions.py
View File

@ -42,7 +42,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '53' base_deps_meta_version = '54'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',

2
travis/bionic_builder.dockerfile
View File

@ -17,6 +17,8 @@ RUN apt update -q && \
libfuse2 fuse patchelf \ libfuse2 fuse patchelf \
# Flatpak tools # Flatpak tools
elfutils flatpak flatpak-builder \ elfutils flatpak flatpak-builder \
# Cross win32 compiler
g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
# Other tools (to remove) # Other tools (to remove)
# vim less grep \ # vim less grep \
&& \ && \

2
travis/xenial_builder.dockerfile
View File

@ -14,8 +14,6 @@ RUN apt update -q && \
# Packaged dependencies # Packaged dependencies
libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \ libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
libmicrohttpd-dev \ libmicrohttpd-dev \
# Cross win32 compiler
g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
# Cross compile i586 # Cross compile i586
libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \ libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
# Other tools (to remove) # Other tools (to remove)