Commit Graph

1425 Commits

Author SHA1 Message Date
3f908f429c Remove x86-64_musl_dyn from the CI.
This target fails on the CI because of conflict between the builded
libraries (lzma, libz) and native library.
As they are both for the same arch but with different libc, python tries
to load them and fails.

There is a real bug somewhere in our toolchain but we need to build for
x86_64 musl right now and this is done in `x86-64_musl_mixed` which pass.
So let's remove it for now.

(`x86-64_musl_dyn` fails with the docker image. It is ok with native
(fedora 38) system)
2023-10-24 10:53:31 +02:00
9a2a9ca188 Do not follow symlink when we copy a directory. 2023-10-24 10:53:31 +02:00
b57f83ed25 Move all toolchain installation in TOOLCHAIN directory.
This is a clearer install and it simplify the base_deps archive creation.
2023-10-24 10:53:31 +02:00
750eeedc42 Update base_deps_meta_version. 2023-10-23 10:19:12 +02:00
149c1d25fb Use musl toolchain with gcc 10.
We need a "old" gcc version to be able to run on "old" systems
(libstdc++.6.0.28)
2023-10-23 10:19:12 +02:00
0ae6b0766b Build x86-64_musl in the CI 2023-10-23 10:19:12 +02:00
c3d3cc5a97 Add x86_64 musl toolchain and platform. 2023-10-23 10:19:12 +02:00
f0ad7b126a Rename arm_musl.py to musl.py.
Those files will contain toolchain for musl. Not specific to arm.
2023-10-23 10:19:12 +02:00
7807e10325 Rename files containing toolchain to tc_* 2023-10-23 10:19:12 +02:00
442fe3df19 Merge pull request #639 from kiwix/fix_libkiwix_version
Revert back the libkiwix version to 12.1.1
2023-10-20 16:24:19 +02:00
2c258d52eb Revert back the libkiwix version to 12.1.1
We don't have a version 13.0.0 for libkiwix.
So the master branch of libkiwix is generating version 12.1.1.

We must use the correct version as we try to fix the rpath on macos
and we we don't have the right version, we fail because the lib file
doesn't exist.
2023-10-20 11:20:57 +02:00
44a8963c50 New version libkiwix 13.0.0
This is mainly a release of libkiwix 12.1.0 as 12.1.0 introduce breaking
changes.

No need to rebuild kiwix-tools (it is already builded with 12.1.0)
Don't build kiwix-destkop as current version of kiwix-desktop is not
ported to kiwix-13.0.0 (`main` is, but not last release).
r_49
2023-09-14 16:06:13 +02:00
6ee003bf9b New version of libkiwix.
Libkiwix 12.1.1 is just a hot patch to avoid a breaking change in 12.1.0

No need to rebuild kiwix-tools.
2023-09-14 13:49:16 +02:00
19ef9178b0 Trigger a new build of libzim.
With the fallback of aarc64 toolchain, we need to rebuild libzim.
r_47
2023-09-01 11:06:49 +02:00
4dfae35d8a Merge pull request #635 from kiwix/aarch_glibcxx 2023-08-24 17:04:03 +02:00
65dd03e58f Move back to the old toolchain for aarch64
Fix #634
2023-08-11 16:18:25 +02:00
75a1963572 Merge pull request #633 from kiwix/fix_kiwix-desktop_deps 2023-07-31 22:59:47 +02:00
458aa97b36 Correctly build (and publish) dependencies for kiwix-desktop. 2023-07-31 17:44:36 +02:00
ad866a7790 Merge pull request #632 from kiwix/fix_ci2 2023-07-29 16:15:38 +02:00
a6aa18cfcc Add missing env variable.
The variables are not used in the context of docker triggering.

I prefer set dummy variables instead of use a default value in the code
to be sure that the variable are defined when needed.
2023-07-29 13:33:37 +02:00
58f9ede10a Merge pull request #631 from kiwix/fix_ci 2023-07-28 11:22:08 +02:00
32db47d007 Add missing runs-on 2023-07-28 10:12:17 +02:00
e9c039dc9b Merge pull request #630 from kiwix/better_ci_def 2023-07-27 16:11:51 +02:00
45b459a03a Trigger docker workflow at the end of other jobs. 2023-07-27 15:20:00 +02:00
8070a750f5 Reorder few lines.
No functional change but it regroups lines with a platform_name.
2023-07-26 15:30:15 +02:00
46c663db09 Move the release platform name in the build definition.
Having the name of the archive define in common is splitting definition
in different files.

The purpose of build_definition is to centralize definition, so move them
there.
2023-07-26 15:28:50 +02:00
7e9a145bc5 Introduce D(ocker) build definition.
Partially fix #629
2023-07-26 15:09:13 +02:00
07e72ffba4 Extend the build definition with P(ublish) and S(ource)
This allow us to better control what we publish.
This fix #628
2023-07-26 15:04:37 +02:00
1876b5f542 New version of libzim and libkiwix
- libzim 8.2.1
- libkiwix 12.1.0
2023-07-20 15:58:54 +02:00
10e920ca00 Fix typos 2023-06-15 09:48:08 +02:00
c58d50474b Merge pull request #611 from kiwix/arm64_musl 2023-06-14 16:45:30 +02:00
7cdffbe22f Correctly add toolchains in deps archives. 2023-06-14 15:57:49 +02:00
1748f48197 Publish aarch64_musl. 2023-06-14 15:57:49 +02:00
64a686effe Build aarch64_musl on the CI. 2023-06-14 15:57:49 +02:00
5884909b25 Add target aarch64_musl_*
I have to mention that adding a new cross compiled target never seems
so simple.
2023-06-14 15:57:49 +02:00
d1b39dfb98 Correctly build native_mixed on bionic and focal.
If `native_mixed` is part of the original target, the "include" with the
`image_variant` will overwrite the combination.

If we remove `native_mixed`, both combinations are added.

See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
2023-06-13 12:38:36 +02:00
0f75a42498 Do not build libzim and libkiwix on macos arm64 static.
We should build them using mixed target only.
2023-06-12 14:46:06 +02:00
d6a2901ff8 Fix typos in build_release_nigthly 2023-06-08 10:15:38 +02:00
23fab75d04 Merge pull request #610 from kiwix/fix_publication_macos
Fix packaging of libzim and libkiwix on macOS.
2023-06-07 17:03:54 +02:00
06d7a26cb4 Fix extraction of major version from version.
Taking the first char is ok only if major version is < 10.
2023-06-07 15:55:59 +02:00
4602ead6be Fix packaging of libzim and libkiwix on macOS.
On MacOs, libraries are in `.dylib`, not `.so`.

Also package the `.pc` file.
2023-06-07 14:06:07 +02:00
07d443d96b Merge pull request #612 from kiwix/better_build_def2 2023-06-07 14:03:33 +02:00
6fe37ba0de Rename osx to macos. 2023-06-02 16:09:22 +02:00
7b6ed275ed Remove code for kiwix-desktop workaround.
As we don't use the workaround now, we can remove the code associated to
it.

It simplify our build definition.
2023-06-02 16:09:22 +02:00
8237adf950 Do not use a specific target native_desktop.
`native_desktop` is not a real target_platform. It is workaround to
specify "build only kiwix-desktop on native_dyn".

It was useful, when we need to build kiwix-desktop on a different build
env than the other project (because of packaging constraints).
Now we can build kiwix-desktop and all other projects on the same build
env, we can remove it and build kiwix-desktop with other `native_dyn`.
2023-06-02 16:09:22 +02:00
7db434ee6d Use the common build definition to specify which deps build.
The build definition update follow what we build in the project's CI,
not what was defined by the replaced python code.
2023-06-02 16:09:22 +02:00
3defd4eba7 Be explicit about all our combinations. 2023-06-02 16:00:26 +02:00
e59e3698b2 Open build definition system to more complex build definition. 2023-06-02 15:58:53 +02:00
fc81551555 Remove unused import. 2023-06-02 15:58:02 +02:00
fd46c52473 Move the definition of what to build in a table.
This provide a better visual definition (and potential better explicit)
of the previous code base on `if/else`.
2023-06-02 15:58:00 +02:00