diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2019-10-10 18:40:40 +0200 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2019-10-14 13:14:37 +0200 |
| commit | 89a6160fd02181d673877d133cc85c9c4ac0dd29 (patch) | |
| tree | 94935c127e9a0d06688e27cc95181b733c753b99 | |
| parent | 2f621820e52444f6a522bfe037935fc0247df6c1 (diff) | |
| download | libosinfo-89a6160fd02181d673877d133cc85c9c4ac0dd29.tar.gz | |
ci: Set NINJA environment variable
We'll start testing on CentOS 7, which doesn't have the "ninja" binary.
Knowing this, we better have a NINJA environment variable setting
accodingly.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26ca335..c5be6a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ .environment: &environment | + export NINJA="ninja" export VIRT_PREFIX="$HOME/build/libvirt" export PATH="$VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH" export C_INCLUDE_PATH="$VIRT_PREFIX/include" @@ -16,7 +17,7 @@ mkdir build cd build meson .. . --prefix=$VIRT_PREFIX --werror - ninja install + $NINJA install popd .osinfo-db-build: &osinfo-db-build | @@ -35,21 +36,21 @@ mkdir build cd build meson .. . --prefix=$VIRT_PREFIX --werror - ninja - ninja install + $NINJA + $NINJA install popd .libosinfo-check: &libosinfo-check | pushd . cd build - ninja test + $NINJA test popd .libosinfo-rpm: &libosinfo-rpm | pushd . cd build sed -i -e 's/BuildRequires: *osinfo-db.*//' *.spec* - ninja dist + $NINJA dist rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta meson-dist/*.tar.xz popd @@ -61,8 +62,8 @@ mkdir build_win32 cd build_win32 meson .. . --cross-file=/usr/share/mingw/toolchain-mingw32.meson --prefix=$MINGW32_VIRT_PREFIX -Denable-gtk-doc=false -Denable-tests=false -Denable-introspection=disabled -Denable-vala=disabled --werror - ninja - ninja install + $NINJA + $NINJA install popd .libosinfo-mingw64-build: &libosinfo-mingw64-build | @@ -73,8 +74,8 @@ mkdir build_win64 cd build_win64 meson .. . --cross-file=/usr/share/mingw/toolchain-mingw64.meson --prefix=$MINGW64_VIRT_PREFIX -Denable-gtk-doc=false -Denable-tests=false -Denable-introspection=disabled -Denable-vala=disabled --werror - ninja - ninja install + $NINJA + $NINJA install popd fedora-29: |