Commit Graph

145 Commits

Author SHA1 Message Date
Matthieu Gautier def0163dfe Fix deployement of archive.
The user name in docker is `ci_builder` not `builder`.
2019-05-27 16:46:36 +02:00
Matthieu Gautier 6306a4d31b As appimage and flatpak use same ubuntu version, merge dockerfiles.
- Use the same structure than xenial dockerfile.
- Do not try to deploy in the docker image as the deployement is made on
  the host.
- Use user `ci_builder` instead of `builder` as it make flatpak fail.
2019-05-13 17:02:39 +02:00
Matthieu Gautier 5a0b7e0998 Move from artful to bionic.
EOL for artful is july 2018.
It seems that now, apt repository has been shutdown for artful.
It is time to move to a more recent ubuntu version.

Bionic is the oldest release for which QtWebEngine has been packaged.
2019-05-07 13:36:57 +02:00
Matthieu Gautier e031eced7c Fix deployment of release and nightly.
Docker image need to copy archive to deploy in the correct directory.
2019-05-06 14:34:25 +02:00
Matthieu Gautier 39d05d1b03 Do not build the base archive for android platform.
We already have a base archive per android_<arch> platform.
We don't need to create another archive that will mainly include the
content of the other archives.
2019-05-03 10:44:19 +02:00
Matthieu Gautier 19ac17a637 Build the docker images in a separated stage.
Images are push to kiwix/kiwix-build_ci
2019-05-03 10:43:50 +02:00
Matthieu Gautier 281adbd768 Build everything in a container.
Docker containers don't have the SSH_KEY so we need to copy
archives and git repo in a directory on the host and
launch deploy.sh script from there.
2019-05-02 17:44:56 +02:00
Matthieu Gautier f9d5e0aa21 Use an already made archive for the armhf toolchains instead of git clone.
First, we don't need to clone all the git repository, we only need a
sub-directory.
Secondly, as we the base_deps archives only archive the sub-directory,
subsequent run of kiwix-build in the ci will try to do a git update on
a non git repository.

By making ourselves a tar archive, we simplify the process.

The archive on download.kiwix.org has been made with :
`tar czf raspberrypy-tools.tar.gz raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64`
`raspberrypi-tools` being a clone of `https://github.com/raspberrypi/tools`
commit sha is 5caa7046982f0539cf5380f94da04b31129ed521
2019-05-02 17:43:11 +02:00
Matthieu Gautier 23a26ff8fc Fix creation of win32 archives.
The win platform starts with `win32_`, not `win-`.
2019-04-01 18:03:41 +02:00
Matthieu Gautier 5a3ccd287f Look for the correct SSH_KEY in the docker environment. 2019-03-19 17:18:17 +01:00
Matthieu Gautier 74210ece52 Update flathub repository.
Push new flathub manifest and patches at each new release.
2019-03-19 15:25:11 +01:00
Matthieu Gautier 6200239bba 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.
2019-03-19 15:25:11 +01:00
Matthieu Gautier 3b91babe2f Use a new constant variable KBUILD_SOURCE_DIR 2019-03-19 15:25:11 +01:00
Matthieu Gautier b4d0e627c5 Add armhf toolschain in base_deps_archive. 2019-03-06 10:24:09 +01:00
Matthieu Gautier e04dd76ee0 Use specific release base deps archive when build release.
Base deps are not compiled the same between a release and debug build.
2019-03-06 10:14:02 +01:00
Matthieu Gautier c2bb79941a Update to last version of linuxdeployqt.
linuxdeployqt now try to get the version of the appimage and include it
in the appimage name.

Let's specify the version and use the correct (new) appimage name.
2019-02-22 10:57:08 +01:00
Matthieu Gautier 40b8bd0d19 Include subdirectory in the libzim release archive.
Header are in the `include/zim` directory but also in `include/zim/creator`
2019-02-22 10:43:46 +01:00
Matthieu Gautier 03c2c26089 Add LOGS dir to the dependencies archives.
This will help to debug.
2019-02-19 17:23:14 +01:00
Matthieu Gautier 5a404438f7 Fix creation of deps archive. 2019-02-18 15:17:34 +01:00
Matthieu Gautier f3ba9346ac Also create the archive in PR.
This way we are testing that archives are well done in the PR, not
after the merge.
2019-02-18 11:29:42 +01:00
Matthieu Gautier 4230ece400 Better of export of file (release and nightly)
As we are exporting libzim, we also need to export header files.
So now, we are using glob to get the list of file to add to the archive.

Fix openzim/libzim#199
2019-02-18 10:29:38 +01:00
Matthieu Gautier 77fc6704ef Do not save the `tools` directory of the toolchains.
This directory came from the source and is only used to install the
sdk. As the sdk is already installed, we don't need it (and we can save
400Mo)
2019-02-06 16:51:42 +01:00
Matthieu Gautier ffc9c1b640 [TRAVIS] Use xz compression to create the deps archives. 2019-02-06 15:28:25 +01:00
Matthieu Gautier fa3343dd97 We need to deploy the real lib, not the symlink to it.
`libzim.so` is a symlink to `libzim.so.4`, who is also a symlink to
`libzim.so.4.0.4`.
2019-02-06 10:24:22 +01:00
Matthieu Gautier 6fd7d77ff1 [TRAVIS] Print progress while we are downloading base_dep archives. 2019-02-05 19:01:32 +01:00
Matthieu Gautier 68902b5642 Build libzim in native_mixed platform on travis. 2019-02-04 17:01:28 +01:00
Matthieu Gautier 681c5b4ec2 [Travis] Use python3.5 instead of default python3.4
Python3.5 add functionnality we need in kiwix-build.
And recent versions of meson need python3.5.
2019-01-17 15:36:32 +01:00
Matthieu Gautier 8005aff6c0 Remove ctpp2 dependency.
kiwix-lib doesn't use ctpp2 anymore but mustache.
So remove ctpp2 dependency and add mustache.
2019-01-09 11:17:41 +01:00
Matthieu Gautier 2980075ce0 Update flatpak_builder to new version of kiwix-desktop
- app-id is now ork.kiwix.desktop
- No need to rename the desktop-file
- `--filesystem=xdg-data` is useless.
2018-12-14 17:00:39 +01:00
Matthieu Gautier c0daff60bd Include zimcheck in the zim-tools archives
Fix openzim/zim-tools#26
2018-12-03 11:19:36 +01:00
Matthieu Gautier 92d637ad99 Better flatpak build.
- Print the name of the module instead of the builder.
- Do not try to build the kiwix-desktop dependencies in the flatpak.
- Correct the path of the created flatpak.
2018-11-30 11:37:23 +01:00
Matthieu Gautier 827c963895 Update upload script to new server user "ci".
On new server, the user `nightlybot` as been renamed to `ci`.
The path of the data used by the download server has also changed.
2018-11-30 11:08:33 +01:00
Matthieu Gautier f41a0dccdb Get base dependencies only if we are not building a flatpak. 2018-11-27 17:22:47 +01:00
Matthieu Gautier ecf3b8b1ff Add an option `--asume-packages-installed` to not try to install packages.
This is different than `--dont-install-packages` that will try to
compile the dependencies.

`--asumme-packages-installed` will no try to install packages, but will
not try either to compile dependencies.
2018-11-27 17:22:47 +01:00
Matthieu Gautier 086361b432 Build the flatpak in travis.
Use docker to have the last version of ubuntu (and flatpak)
2018-11-27 17:22:47 +01:00
Matthieu Gautier ed63ffe24c Add aria2 dependency.
kiwix-desktop needs the aria2 binary to download content.
kiwix-desktop will use aria2 throw lib-kiwix so it is somehow a kiwix-lib
dependency, but it is used only by kiwix-desktop.

And we know to install it only on platforms where we are supporting
kiwix-destkop.
2018-11-27 17:22:47 +01:00
Kelson 70301d4723 New tmp.kiwix.org server 2018-11-07 03:51:13 +01:00
Kelson d9ef792172 Update Travis for new download server 2018-11-03 14:38:46 +01:00
Matthieu Gautier 0600be96ac Force the build of libcurl instead of using system one.
On ubuntu, the libcurl package is compiled with libkrb (kerberos).
However, no libkrb5.a is provided and so, we cannot link statically.

As we are not using kerberos, we can (and must) compile ourselves libcurl.
2018-10-31 15:33:12 +01:00
Matthieu Gautier 1e67a6b50f Add libcurl dependency.
This is needed for new kiwix-lib version.
We also remove libaria as kiwix-lib use aria2 binary directly.
2018-10-23 11:57:58 +02:00
Matthieu Gautier b3a3d0399f Last version of travis osx already have a python 3.6 installed. 2018-10-23 11:57:58 +02:00
Matthieu Gautier ecc6927de8 Use git archive to create dist source archive.
qmake seems to generate wrong "dist" rules for "make".
It try to copy the translation files as if it was in current directory
instead of looking the source dir.

dist archive is usefull with autotools where we want to run autogen before.
Or with meson when meson run tests before making the archive.

With qmake, it seems useless, let's simply archive what is git.
2018-09-05 19:38:58 +02:00
Matthieu Gautier df0b684869 Correctly find the version of a dependency.
We have separated the version in two separated dicts since a long time :/
2018-09-05 19:31:38 +02:00
Matthieu Gautier 07e8b36efb Do not overwrite release build archives.
We new release of a project is made, projects dependending of it are
rebuild and republish to keep the binaries up-to-date.

To avoid overwrite the already build archives and silent the fact that
new archives are available, we need to have a extra build version.

`release_versions[project]` has to be set each time a dependency of
`project` is bump but the project version has not changed.

If the `project` version changes, the `release_versions[project]`
has to be cleared.

If we don't want to release this version again, remove project from
`release_versions`.

See kiwix/kiwix-tools#222
2018-09-04 17:56:01 +02:00
Matthieu Gautier b16213b1c0 Use the ZIP_DEFLATED compression when creating zip archive.
The building Windows zip decompressor handles only DEFLATED.
2018-08-28 14:56:56 +02:00
Matthieu Gautier 22a580d070 Fix the src path of kiwix-desktop when doing release.
kiwix-build add `_release` postfix, not the version number.
2018-08-06 10:49:53 +02:00
Matthieu Gautier cad38f8a53 Use the correct source path of kiwix-desktop when doing release. 2018-08-06 09:24:29 +02:00
Matthieu Gautier f51204d424 [Travis] Also build kiwix-desktop when building for release. 2018-08-04 09:06:38 +02:00
Matthieu Gautier c256857e01 Create the app image using the ".appimage" extension.
Fix kiwix/kiwix-desktop#19
2018-08-03 15:53:13 +02:00
Matthieu Gautier afc6bf0907 Add svg icon support into the appimage
- Add missing packages in Dockerfile to support svg icons.
- Include needed plugins in the appimage.
2018-08-03 15:53:13 +02:00