Commit Graph

311 Commits

Author SHA1 Message Date
Matthieu Gautier 0da2ffbd4c
Merge pull request #127 from kiwix/fix_deploy
Fix deploy
2018-03-16 09:53:32 +01:00
Matthieu Gautier f88f27edac Indicate release tag of zimwriterfs. 2018-03-15 17:42:41 +01:00
Matthieu Gautier 0594486afd Fix deployment of different release archives.
Fix #12.
2018-03-15 17:42:15 +01:00
Matthieu Gautier 87d80928ee Simplify a bit usage of make_archive. 2018-03-15 17:06:13 +01:00
Matthieu Gautier 579109ab79 `make_archive` now takes different arguments to compute the archive name. 2018-03-15 16:55:19 +01:00
Kelson bb37572ce1
Merge pull request #125 from kiwix/fix_archive_typo
Fix small typos in the armhf name.
2018-02-27 20:24:51 +01:00
Kelson 3180b5f761
Merge branch 'master' into fix_archive_typo 2018-02-26 20:27:14 +01:00
Matthieu Gautier 89696df3e3
Merge pull request #126 from kiwix/fix_travis_typos
Fix typos.
2018-02-26 15:50:44 +01:00
Matthieu Gautier ed89cbccd8 Correct environment variable name. 2018-02-26 14:33:31 +01:00
Matthieu Gautier d7dd02e922 Do not try to deploy android apks if we are not building them. 2018-02-26 11:36:55 +01:00
Matthieu Gautier 6f6ffa5f87 Fix typos. 2018-02-26 11:31:12 +01:00
Matthieu Gautier ea54c56529 Fix small typos in the armhf name.
Fix kiwix/kiwix-tools#157
2018-02-26 11:12:05 +01:00
Matthieu Gautier bef0572db5
Merge pull request #124 from kiwix/travis_tags_fixes
Travis tags fixes
2018-02-23 18:08:58 +01:00
Matthieu Gautier 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
Matthieu Gautier 5ffa9ca323 Fixes typos and add download.openzim.org to known hosts. 2018-02-23 14:49:15 +01:00
Matthieu Gautier 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
Matthieu Gautier 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
Matthieu Gautier 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
Matthieu Gautier 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
Matthieu Gautier 7acd504038
Merge pull request #120 from kiwix/missing_then
Add missing 'then' in deploy.sh
2018-02-07 10:56:09 +01:00
Matthieu Gautier 4e35e70ef3
Add missing 'then' in deploy.sh 2018-02-07 08:36:17 +00:00
Matthieu Gautier 4d8fe1a23c
Merge pull request #119 from kiwix/fix_typo
Fix typo.
2018-02-06 21:13:47 +01:00
Matthieu Gautier 8ccd46966b
Fix typo. 2018-02-06 19:22:51 +00:00
Matthieu Gautier 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
Matthieu Gautier fe2796f9bc
Use absolute path for the archive name 2018-02-05 08:30:09 +00:00
Matthieu Gautier 56fafe55d6
Merge pull request #117 from kiwix/ssh_key
right name for ssh key
2018-02-04 05:24:08 +01:00
Matthieu Gautier 83b5f5be79 right name for ssh key 2018-02-04 04:10:41 +01:00
Matthieu Gautier 391a0f5494
Merge pull request #116 from kiwix/ssh_key
convert SSH_KEY from PosixPath to str
2018-02-03 23:51:37 +01:00
Matthieu Gautier 96b68fc50f convert SSH_KEY from PosixPath to str 2018-02-03 21:51:28 +01:00
Matthieu Gautier 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
Matthieu Gautier 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
Matthieu Gautier cfb20517a1
Merge pull request #114 from kiwix/fix_typo
fix typo in compile_all.py
2018-02-03 05:21:48 +01:00
Matthieu Gautier 51ba7132a4 fix typo in compile_all.py 2018-02-02 23:46:47 +01:00
Matthieu Gautier 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
Matthieu Gautier cb468fc49f We must deploy releases archive when a tag is set not on cron. 2018-02-02 12:07:01 +01:00
Matthieu Gautier 524da9c4fe
Merge pull request #103 from kiwix/travis_update
New travis script written in python.
2018-02-02 11:41:50 +01:00
Matthieu Gautier 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
Matthieu Gautier 47b00fe5dc Update subproject version. 2018-02-01 16:51:22 +01:00
Matthieu Gautier 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
Matthieu Gautier 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
Kelson 6326fadde2
Merge pull request #105 from kiwix/mhutti1/android-build-fix
Fix Android APK output location
2018-01-03 08:39:46 +01:00
Isaac Hutt 14d4651504
Fix Android APK output location 2018-01-02 22:51:11 +00:00
Kelson 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
kelson42 680c95b1fc Fix kiwix-tools archive name for linux64 2017-12-17 19:34:44 +01:00
Kelson 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
mhutti1 38ba4dbcc2 Change apk output directory to new location 2017-12-15 11:06:49 +00:00
Matthieu Gautier afc32ff71e
Merge pull request #98 from kiwix/meson_test
Stop using the deprecated (and broken) `mesontest`.
2017-12-13 14:50:04 +00:00
Matthieu Gautier 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
Matthieu Gautier 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
Matthieu Gautier 29157c96eb
Merge pull request #96 from kiwix/make_release
Make release
2017-12-05 10:20:41 +00:00