Skip to content

Commit

Permalink
Build libkiwix on native_mixed.
Browse files Browse the repository at this point in the history
If we build on `native_static`, we will have no `.so` to publish.

If projects are build on `native_mixed` no need to build them on
`native_static` or `native_dyn`.
("Build" a project trigger an explicit build on them, and potentially a
publishing. Projects will still be compiled if they are dependencies of
other build project.)

Fix kiwix/libkiwix#548
  • Loading branch information
mgautierfr committed Nov 16, 2022
1 parent 649cfb8 commit adc0d53
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/scripts/build_projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx":
if PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim", )
TARGETS = ("libzim",)
else:
TARGETS = ("libzim", "zim-tools", "libkiwix")
TARGETS = ("zim-tools", "libkiwix")
else:
if DESKTOP:
TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim",)
TARGETS = ("libzim", "libkiwix")
else:
TARGETS = ("zim-tools", "libkiwix", "kiwix-tools")
TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"):
TARGETS = ("kiwix-tools",)
elif PLATFORM_TARGET == "flatpak":
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/build_release_nightly.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
if DESKTOP:
TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET == "native_mixed":
TARGETS = ("libzim",)
TARGETS = ("libzim", "libkiwix")
else:
TARGETS = ("zim-tools", "libkiwix", "kiwix-tools")
TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"):
TARGETS = ("kiwix-tools",)
elif PLATFORM_TARGET == "flatpak":
Expand Down

0 comments on commit adc0d53

Please sign in to comment.