From 7b5ac4269905a6d40cfdc07f76815a878c079c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Thu, 9 Mar 2023 23:43:16 +0100 Subject: [PATCH] ci: use meson to install build artifacts --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5257f62..8ce94c678 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,7 +180,7 @@ include: - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS - ninja $NINJA_ARGS -C "$BUILD_DIR" - meson test -C "$BUILD_DIR" --no-rebuild - - ninja $NINJA_ARGS -C "$BUILD_DIR" install + - meson install -C "$BUILD_DIR" --no-rebuild artifacts: name: pipewire-$CI_COMMIT_SHA when: always @@ -335,7 +335,7 @@ build_session_managers: - echo "Building with meson options $MESON_OPTIONS" - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS - ninja $NINJA_ARGS -C "$BUILD_DIR" - - ninja $NINJA_ARGS -C "$BUILD_DIR" install + - meson install -C "$BUILD_DIR" --no-rebuild variables: MESON_OPTIONS: "-Dsession-managers=$SESSION_MANAGERS" parallel: @@ -351,7 +351,7 @@ build_meson_prerelease: - echo "Building with meson options $MESON_OPTIONS" - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS - ninja $NINJA_ARGS -C "$BUILD_DIR" - - ninja $NINJA_ARGS -C "$BUILD_DIR" install + - meson install -C "$BUILD_DIR" --no-rebuild variables: MESON_OPTIONS: "-Dsession-managers=wireplumber,media-session" allow_failure: true @@ -368,7 +368,7 @@ build_meson_exact_release: - echo "Building with meson options $MESON_OPTIONS" - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS - ninja $NINJA_ARGS -C "$BUILD_DIR" - - ninja $NINJA_ARGS -C "$BUILD_DIR" install + - meson install -C "$BUILD_DIR" --no-rebuild variables: MESON_OPTIONS: "-Dsession-managers=[]"