Build kiwix-tools with new archive from kiwix-build

This commit is contained in:
Matthieu Gautier 2024-04-08 16:36:50 +02:00
parent fcbb4a56bc
commit 24d81f9507

View File

@ -8,23 +8,27 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
target: target:
- native_static - linux-x86_64-static
- native_dyn - linux-x86_64-dyn
- win32_static - win32-static
- win32_dyn - win32-dyn
include: include:
- target: native_static - target: linux-x86_64-static
image_variant: focal image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: native_dyn arch_name: linux-x86_64
- target: linux-x86_64-dyn
image_variant: focal image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: win32_static arch_name: linux-x86_64
- target: win32-static
image_variant: f35 image_variant: f35
lib_postfix: '64' lib_postfix: '64'
- target: win32_dyn arch_name: i686-w64-mingw32
- target: win32-dyn
image_variant: f35 image_variant: f35
lib_postfix: '64' lib_postfix: '64'
arch_name: i686-w64-mingw32
env: env:
HOME: /home/runner HOME: /home/runner
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -44,17 +48,17 @@ jobs:
- name: Compile - name: Compile
shell: bash shell: bash
run: | run: |
if [[ "${{matrix.target}}" =~ .*_static ]]; then if [[ "${{matrix.target}}" =~ .*-static ]]; then
MESON_OPTION="-Dstatic-linkage=true" MESON_OPTION="-Dstatic-linkage=true"
else else
MESON_OPTION="" MESON_OPTION=""
fi fi
if [[ ! "${{matrix.target}}" =~ native_.* ]]; then if [ -e "$HOME/BUILD_${{matrix.arch_name}}/meson_cross_file.txt" ]; then
MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt" MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.arch_name}}/meson_cross_file.txt"
fi fi
meson . build ${MESON_OPTION} meson . build ${MESON_OPTION}
cd build cd build
ninja ninja
env: env:
PKG_CONFIG_PATH: "${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig:${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig" PKG_CONFIG_PATH: "${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/lib/pkgconfig:${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
CPPFLAGS: "-I${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/include" CPPFLAGS: "-I${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/include"