Commit Graph

816 Commits

Author SHA1 Message Date
Matthieu Gautier 4868128551 Build for armeabi-v7a.
The main thing is to add the `-march` option when needed.
Ie, '-march=armv7-a` for arm.
Other compiler (arm64, x86, ...) don't support the march option so
we must not provide it.
2019-06-14 14:13:18 +02:00
Matthieu Gautier ef9755eff5 Remove android mips platforms
Also correctly rename Android classes.
2019-06-14 14:13:18 +02:00
Matthieu Gautier 92679b72a0 Fix typos in deploy.sh 2019-06-14 11:40:41 +02:00
Kelson d3b0d76726 Revert "update android sdk tools to 26.1.1"
This reverts commit 51029fe820.
2019-06-12 15:50:18 +02:00
Matthieu Gautier a85296d38b
Merge pull request #335 from kiwix/fix_git
Fix git
2019-06-12 15:24:58 +02:00
Matthieu Gautier e0eb5c4a38 Set the versions to rebuild kiwix-desktop release. 2019-06-12 13:55:06 +02:00
Matthieu Gautier 388ac6fdb9 Fix git clone
Clone using https (without ssh key) in the docker.
Push using git (with ssh key) in the travis host.
2019-06-12 13:55:06 +02:00
Kelson c76f2e7c51
Merge pull request #306 from kiwix/mhutti1/gradlew-upgrade
Gradle upgrade to 5.2
2019-06-03 07:40:11 +02:00
Isaac Hutt 06da96f85f Update gradle to 5.2 2019-06-03 06:26:28 +02:00
Kelson 12d087a1b9
Merge pull request #334 from kiwix/disable_xapian_backend_remote
Disable Xapian remote backend
2019-06-02 23:16:35 +02:00
Kelson 456537e188 Disable Xapian remote backend 2019-06-02 17:15:26 +02:00
Kelson 55cff4ef83
Merge pull request #333 from kiwix/soloturn/sdk-update
update android sdk tools to 26.1.1
2019-06-02 16:18:03 +02:00
soloturn 51029fe820 update android sdk tools to 26.1.1 2019-06-02 15:08:17 +02:00
Matthieu Gautier 750c6aada9
Merge pull request #330 from kiwix/fix_deploy
Fix deploy
2019-05-31 00:16:47 +02:00
Matthieu Gautier 629fccb327 Fix deploy
- Also deploy when we have DESKTOP_ONLY (because docker image doesn't
deploy anymore)
- Correctly get the list of git directory to push.
2019-05-30 18:13:22 +02:00
Matthieu Gautier b90f32e9bf
Merge pull request #329 from kiwix/new_versions
New version of zimwriterfs.
2019-05-30 16:23:51 +02:00
Matthieu Gautier cea7a83ba1 New version of zimwriterfs.
We also rebuild kiwix-desktop because last build's deployment fails.
2019-05-30 15:30:17 +02:00
Matthieu Gautier 854a21367a
Merge pull request #328 from kiwix/fix_git_deploy
Fix deployement of git repositories.
2019-05-29 15:18:31 +02:00
Matthieu Gautier 27e92724e7 Fix deployement of git repositories.
The git repositories to upload are in the $EXPORT_DIR/GIT.
So we need to move there before try to push them.
2019-05-29 14:08:33 +02:00
Matthieu Gautier a731cf43a3
Merge pull request #327 from kiwix/new_versions
Update to new versions.
2019-05-29 13:03:31 +02:00
Matthieu Gautier e64a12207d Update to new versions. 2019-05-29 12:15:02 +02:00
Matthieu Gautier ffcc784751
Merge pull request #326 from kiwix/appimage_less_verbose
Make the appimage creation less verbose.
2019-05-29 12:10:40 +02:00
Matthieu Gautier 3c4da32054 Make the appimage creation less verbose.
`verbose=3` is too verbose for travis. Travis kill our job because the log
is too long.
2019-05-29 10:25:59 +02:00
Matthieu Gautier b22734c8a9
Merge pull request #325 from kiwix/fix_appimage
Use `-unsupported-allow-new-glibc` option to package on bionic.
2019-05-28 18:21:29 +02:00
Matthieu Gautier 6e8c8fafb4 Use `-unsupported-allow-new-glibc` option to package on bionic. 2019-05-28 11:16:06 +02:00
Matthieu Gautier df9e269bc1
Merge pull request #324 from kiwix/fix_deploy
WIP add debug on deploy.
2019-05-28 09:56:04 +02:00
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 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