Commit Graph

948 Commits

Author SHA1 Message Date
f6c3083505 Do not try to compile kiwix-android if we make a release.
kiwix-android is following its own release process and tagging policy.
Will should fix this in the future but trying to compile kiwix-android
master branch may fail with tagged version of kiwix-lib.
2018-02-23 14:50:48 +01:00
5ffa9ca323 Fixes typos and add download.openzim.org to known hosts. 2018-02-23 14:49:15 +01:00
5f20f9939c Merge pull request #123 from kiwix/deploy_on_tags
We must run the deploy command even on tag push.
2018-02-23 11:45:11 +01:00
1027b3e1ee We must run the deploy command even on tag push.
In case of tag push, travis will trigger a build but will set
TRAVIS_BRANCH to the tag name, not "master".
So by default, the deploy script will be skipped in case of tag push.

There is a option "tags: true" to deploy on tag push. But it will run
deploy script ONLY on tag push, not on cron build.

So we need two "identical" deploy script, one for tags only and
one for cron build.

As we also need to activate travis build on push (because we push tags),
travis will end to build twice a PR (one for the PR and one for the pushed
branch). So we need to allow build only for `master` branches and tags.
2018-02-23 10:37:43 +01:00
ab1b16ebde Merge pull request #122 from kiwix/rel_name_in_dep_archives
Files in the deps archive must not be absolute path.
2018-02-22 12:03:10 +01:00
3b12557df8 Files in the deps archive must not be absolute path.
The archives will be extracted in the right directory. We need to store
relative paths.
2018-02-22 10:43:06 +01:00
7acd504038 Merge pull request #120 from kiwix/missing_then
Add missing 'then' in deploy.sh
2018-02-07 10:56:09 +01:00
4e35e70ef3 Add missing 'then' in deploy.sh 2018-02-07 08:36:17 +00:00
4d8fe1a23c Merge pull request #119 from kiwix/fix_typo
Fix typo.
2018-02-06 21:13:47 +01:00
8ccd46966b Fix typo. 2018-02-06 19:22:51 +00:00
4af121c1df Merge pull request #118 from kiwix/abs_path_archive
Use absolute path for the archive name
2018-02-05 17:56:28 +01:00
fe2796f9bc Use absolute path for the archive name 2018-02-05 08:30:09 +00:00
56fafe55d6 Merge pull request #117 from kiwix/ssh_key
right name for ssh key
2018-02-04 05:24:08 +01:00
83b5f5be79 right name for ssh key 2018-02-04 04:10:41 +01:00
391a0f5494 Merge pull request #116 from kiwix/ssh_key
convert SSH_KEY from PosixPath to str
2018-02-03 23:51:37 +01:00
96b68fc50f convert SSH_KEY from PosixPath to str 2018-02-03 21:51:28 +01:00
2b40901294 Merge pull request #115 from kiwix/write_text_using_py34
`write_text` method exists only on python 3.5.
2018-02-03 21:12:56 +01:00
220d434b88 write_text method exists only on python 3.5.
And travis is using python 3.4 :/
2018-02-03 19:56:00 +01:00
cfb20517a1 Merge pull request #114 from kiwix/fix_typo
fix typo in compile_all.py
2018-02-03 05:21:48 +01:00
51ba7132a4 fix typo in compile_all.py 2018-02-02 23:46:47 +01:00
4ff307328f Merge pull request #112 from kiwix/travis_deploy
We must deploy releases archive when a tag is set not on cron.
2018-02-02 14:46:51 +01:00
cb468fc49f We must deploy releases archive when a tag is set not on cron. 2018-02-02 12:07:01 +01:00
524da9c4fe Merge pull request #103 from kiwix/travis_update
New travis script written in python.
2018-02-02 11:41:50 +01:00
06cf4d44d0 New travis script written in python and handle release deployement.
`compile_all.sh` script starts to be very complex.
Let's rewrite it in python.

In the same time, update the travis scripts to handle deployement of
release versions.
2018-02-01 18:21:59 +01:00
47b00fe5dc Update subproject version. 2018-02-01 16:51:22 +01:00
170ba5e3b1 Merge pull request #111 from kiwix/icu4c_patch
Backport icu4c patch to not include `xlocale.h`
2018-01-29 15:07:57 +01:00
b8f913ce69 Backport icu4c patch to not include xlocale.h
Last version of glibc 2.26 has removed the `xlocal.h` file.
(https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27)

We cannot use last version of icu4c (60.1) because it used a feature not
yet exported in mingw32 releases.

So we need to backport a patch for this.

Fix #110
2018-01-29 11:15:50 +01:00
6326fadde2 Merge pull request #105 from kiwix/mhutti1/android-build-fix
Fix Android APK output location
2018-01-03 08:39:46 +01:00
14d4651504 Fix Android APK output location 2018-01-02 22:51:11 +00:00
426e88b626 Merge pull request #102 from kiwix/archive_name_fix
Fix kiwix-tools archive name for linux64
2017-12-17 20:53:25 +01:00
680c95b1fc Fix kiwix-tools archive name for linux64 2017-12-17 19:34:44 +01:00
4e6ed8240c Merge pull request #101 from kiwix/mhutti1/android-output
Change apk output directory to new location
2017-12-16 19:44:39 +01:00
38ba4dbcc2 Change apk output directory to new location 2017-12-15 11:06:49 +00:00
afc32ff71e Merge pull request #98 from kiwix/meson_test
Stop using the deprecated (and broken) `mesontest`.
2017-12-13 14:50:04 +00:00
6768631b25 Force installation of meson 0.43.0.
There are some problem in meson 0.44.0.

`meson` change the way it detects static libraries (to something that seems
better to me), but it breaks some of our build that we have to fix.

Until we have fixed our dependencies declaration, let's force meson to
be in 0.43.0.
2017-12-13 15:09:58 +01:00
1c8b8ef99b Stop using the deprecated (and broken) mesontest.
`mesontest` command is deprecated since meson 0.42.0 and broken with last
release (0.44.0) (see mesonbuild/meson#2761).

Fix #97.
2017-12-12 11:19:07 +00:00
29157c96eb Merge pull request #96 from kiwix/make_release
Make release
2017-12-05 10:20:41 +00:00
ba7028f0a8 Force the source_dir of ctpp2 source.
The `source_dir` is automatically infer from the name of the dependency.
As the ctpp2 source is use in two dependencies (ctpp2 and ctpp2c), if
we use the default source_dir, kiwix-build will use one name and the
other dependency will not find the source directory.

By forcing the `source_dir`, both dependencies will use the same directory.
2017-12-05 09:32:47 +00:00
43937caf6d Make travis create the dist archive.
TODO: Copy the archive at the right place.
2017-12-05 09:32:47 +00:00
a9ce8ee8c1 Add a --make-dist command to kiwix-build.
If specified, kiwix-build will not "make/install" the target but make
the dist archive (source).

It will build dependencies, as the make dist will try to compile and test
the target.
2017-12-05 09:32:47 +00:00
bb5b85da50 Make travisCI publish binaries as release versions when tag is pushed.
This publish the same this that nightly build except that :
- Use the `--make-release` option to force kiwix-build to use tagged
  version of subprojects.
- The archives are named using the tag name.
- The archives are pushed to "releases" directory in download.kiwix.org.
2017-12-05 09:32:47 +00:00
e4f8b6c7a9 Add a option to kiwix-build.py to build release version of subproject.
With `--make-release` option, kiwix-build.py will build the tagged
version of the subproject.
2017-11-28 22:42:16 +00:00
9823f7ae48 Merge pull request #95 from kiwix/ci_zimwriterfr_zimtools
Also compile zim-tools and zimwriterfs in the CI.
2017-11-28 22:41:17 +00:00
603300c154 Allow android build to fails.
Recent changes on android side make the build fails.
While this is not fixed, do not block MR not related to kiwix-android.

This should be reverted as soon as kiwix-android build is fixed.
2017-11-28 21:41:17 +00:00
7c7471e01c Update version of gradle.
`kiwix-android` changes the minimum version of gradle to use
kiwix/kiwix-android#289

Let's adapt.
2017-11-28 15:18:37 +00:00
d7ffc4bd34 Add gumbo dependency.
This is needed by zimwriterfs and the package doesn't exist on
ubuntu trusty (used by travis CI).
2017-11-28 14:30:31 +00:00
19730ed7c3 Compile zim-tools only on native platform.
There is no gcc-5 compiler available for cross-compiling.
2017-11-28 13:13:15 +00:00
53ecc65b9d Zimwriterfs need libmagic-dev.
Install the package `libmagic-dev`.

There is no precompiled libmagic package from cross-compilation and we
are mainly using zimwriterfs only on linux.
2017-11-28 13:11:39 +00:00
7fc557dd44 Use gcc-5 to compile everything.
Zimsplit use ofstream move `operator=()` or `swap()` method.
This has been implemented in gcc-5 only
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316)

So install g++-5 and use it in travis CI.
2017-11-28 12:26:08 +00:00
89e6068572 Also compile zim-tools and zimwriterfs in the CI.
Nightly will also be publish alongside with other nightly's.

Fixes #89 and #90
2017-11-28 12:26:01 +00:00