Commit Graph

1139 Commits

Author SHA1 Message Date
Matthieu Gautier 83fa604613
Merge pull request #322 from kiwix/merge_dockerfiles
As appimage and flatpak use same ubuntu version, merge dockerfiles.
2019-05-13 19:24:54 +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 1ce4c11ec4
Merge pull request #321 from kiwix/artful_to_bionic
Move from artful to bionic.
2019-05-07 17:25:38 +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 bc5f0a5050
Merge pull request #320 from kiwix/fix_deploy_build_docker
Do not try to deploy things when we are building docker images.
2019-05-07 13:18:46 +02:00
Matthieu Gautier bf5e378963 Do not try to deploy things when we are building docker images. 2019-05-06 18:32:41 +02:00
Matthieu Gautier 8fe54b9f96
Merge pull request #319 from kiwix/fix_deploy
Fix deployment of release and nightly.
2019-05-06 15:31:08 +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 6eb4c5a8b6
Merge pull request #318 from kiwix/podman
Docker
2019-05-03 17:05:06 +02:00
Matthieu Gautier 0142dc94d4 [CI] Start to build flatpak first in the CI
The flatpak build is the longer job. By starting it in the first jobs,
we reduce a bit the total build time.
2019-05-03 10:52:14 +02:00
Matthieu Gautier 2b2dd9f118 Do not build the multi arch android app on pullrequest.
We already build on all android arch on specific job.
So no need to check recompile the same thing.
2019-05-03 10:52:14 +02:00
Matthieu Gautier 556095f893 Build android after all other build.
Because we need the android_<arch> build to be done before.
2019-05-03 10:52:14 +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 318c524f4c Use our own server to store libmagic. 2019-04-30 15:28:21 +02:00
Matthieu Gautier d8288a94d5 Build on travis using xenial. 2019-04-16 17:16:36 +02:00
Matthieu Gautier 88bb9231ea
Merge pull request #314 from kiwix/new_release
New release of kiwix-tools
2019-04-16 14:39:09 +02:00
Matthieu Gautier 470d46cc00 New release of kiwix-tools 2019-04-16 14:32:44 +02:00
Matthieu Gautier ae32109f48
Merge pull request #312 from kiwix/new_releases
New release of projects
2019-04-15 19:09:40 +02:00
Matthieu Gautier 7306c02c5a New release of projects 2019-04-15 17:16:17 +02:00
Matthieu Gautier d8b780978b
Merge pull request #310 from kiwix/unordered-flatpak-manifest
fix unordered flatpak's manifest
2019-04-15 14:44:43 +02:00
luddens f090551d13 fix unordered flatpak's manifest
dictionnaries aren't ordered with python 3.5, OrderDict() fixes that.
2019-04-09 17:03:33 +02:00
Matthieu Gautier e7a8583d9e
Merge pull request #308 from kiwix/qt_build
Qt build
2019-04-02 13:44:27 +02:00
Matthieu Gautier 3022361d7e Add a list of package to install on fedora for qt. 2019-04-02 12:05:52 +02:00
Matthieu Gautier a282bd8ce3 Allow a list of packages to install to be set `True` to skip installation.
This can allow a dependency to be marked as installed even if there is
nothing to install.
2019-04-02 12:05:52 +02:00
Matthieu Gautier 9cd8fae632
Merge pull request #307 from kiwix/fix_win32_archive
Fix creation of win32 archives.
2019-04-02 10:23:44 +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 250c20ced6
Merge pull request #304 from kiwix/new_release
New release
2019-03-19 18:48:51 +01:00
Matthieu Gautier 714eeb3bb9 New releases of projects. 2019-03-19 18:01:05 +01:00
Matthieu Gautier 5a3ccd287f Look for the correct SSH_KEY in the docker environment. 2019-03-19 17:18:17 +01:00
Matthieu Gautier 0a768a2aac
Merge pull request #298 from kiwix/flatpak_release
Flatpak release
2019-03-19 16:26:37 +01:00
Matthieu Gautier 4ac7fb1ed0 Notify by mail if build fails 2019-03-19 15:25:11 +01:00
Matthieu Gautier da30e11f6a Fix publication of release kiwix-desktop on windows. 2019-03-19 15:25:11 +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 9f77ddd6ee
Merge pull request #303 from kiwix/meson_0.49.2
Force the use of meson 0.49.2
2019-03-19 15:24:22 +01:00
Matthieu Gautier 49ee0ee92b Workaround for mesonbuild/meson#5097
Force the use of meson 0.49.2
2019-03-19 10:33:47 +01:00
Matthieu Gautier 44ae7ab4d9
Merge pull request #302 from kiwix/fix_release
Fix release
2019-03-06 19:12:55 +01:00
Matthieu Gautier 2970a2d445 Update to new version of lzma and get it from kiwix.org server.
It seems that the downloading of the archive stored on sourceforge
fails sometime.

Use the archive stored in our server (download.kiwix.org) instead.
And also move to the last version of lzma.
2019-03-06 10:24:09 +01:00
Matthieu Gautier b4d0e627c5 Add armhf toolschain in base_deps_archive. 2019-03-06 10:24:09 +01:00
Matthieu Gautier b130b85066 Add tmp.kiwix.org to known hosts. 2019-03-06 10:14:02 +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 1341c8b401 Do not strip libraries in release_mode.
Meson use gcc's `-s` option to create the archive.
This option should make gcc meemic `ar` tool but in some version of gcc,
it seems there is a bug and the `-s` option is not taken into account.

See https://github.com/mesonbuild/meson/issues/4138

So, do not try to strip libraries. We will strip the final binaries anyway.
2019-03-04 13:53:26 +01:00
Matthieu Gautier d31d9985c7
Merge pull request #300 from kiwix/new_release
New release
2019-02-22 11:51:44 +01:00
Matthieu Gautier 70fff445c0 Update version of kiwix-lib and kiwix-tools.
Rebuild also libzim as we were wrongly packaging the archive.
2019-02-22 11:21:50 +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