mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: do not omit "setup" from the meson command

Browse source 
meson prints the following warning:

  WARNING: Running the setup command as `meson [options]` instead
           of `meson setup [options]` is ambiguous and deprecated.
This commit is contained in:
Barnabás Pőcze 2023-03-09 23:32:53 +01:00
parent 82e30d46a9
commit b382d2eba8
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -177,7 +177,7 @@ include:
fi fi
script: script:
- echo "Building with meson options $MESON_OPTIONS" - echo "Building with meson options $MESON_OPTIONS"
- meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
- ninja $NINJA_ARGS -C "$BUILD_DIR" - ninja $NINJA_ARGS -C "$BUILD_DIR"
- ninja $NINJA_ARGS -C "$BUILD_DIR" test - ninja $NINJA_ARGS -C "$BUILD_DIR" test
- ninja $NINJA_ARGS -C "$BUILD_DIR" install - ninja $NINJA_ARGS -C "$BUILD_DIR" install
@ -312,7 +312,7 @@ build_with_custom_options:
MESON_OPTION_VALUE: [enabled, disabled] MESON_OPTION_VALUE: [enabled, disabled]
script: script:
- echo "Building with -D$MESON_OPTION=$MESON_OPTION_VALUE" - echo "Building with -D$MESON_OPTION=$MESON_OPTION_VALUE"
- meson "$BUILD_DIR" . --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE" -Dsession-managers=[] - meson setup "$BUILD_DIR" --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE" -Dsession-managers=[]
- ninja $NINJA_ARGS -C "$BUILD_DIR" - ninja $NINJA_ARGS -C "$BUILD_DIR"
- ninja $NINJA_ARGS -C "$BUILD_DIR" test - ninja $NINJA_ARGS -C "$BUILD_DIR" test
@ -333,7 +333,7 @@ build_session_managers:
- .build_on_fedora - .build_on_fedora
script: script:
- echo "Building with meson options $MESON_OPTIONS" - echo "Building with meson options $MESON_OPTIONS"
- meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
- ninja $NINJA_ARGS -C "$BUILD_DIR" - ninja $NINJA_ARGS -C "$BUILD_DIR"
- ninja $NINJA_ARGS -C "$BUILD_DIR" install - ninja $NINJA_ARGS -C "$BUILD_DIR" install
variables: variables:
@ -349,7 +349,7 @@ build_meson_prerelease:
script: script:
- pip3 install --upgrade --pre meson - pip3 install --upgrade --pre meson
- echo "Building with meson options $MESON_OPTIONS" - echo "Building with meson options $MESON_OPTIONS"
- meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
- ninja $NINJA_ARGS -C "$BUILD_DIR" - ninja $NINJA_ARGS -C "$BUILD_DIR"
- ninja $NINJA_ARGS -C "$BUILD_DIR" install - ninja $NINJA_ARGS -C "$BUILD_DIR" install
variables: variables:
@ -366,7 +366,7 @@ build_meson_exact_release:
- pip3 uninstall --yes meson - pip3 uninstall --yes meson
- pip3 install "meson==$meson_version" - pip3 install "meson==$meson_version"
- echo "Building with meson options $MESON_OPTIONS" - echo "Building with meson options $MESON_OPTIONS"
- meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
- ninja $NINJA_ARGS -C "$BUILD_DIR" - ninja $NINJA_ARGS -C "$BUILD_DIR"
- ninja $NINJA_ARGS -C "$BUILD_DIR" install - ninja $NINJA_ARGS -C "$BUILD_DIR" install
variables: variables:
@ -377,7 +377,7 @@ valgrind:
- .build_on_fedora - .build_on_fedora
script: script:
- echo "Building with meson options $MESON_OPTIONS" - echo "Building with meson options $MESON_OPTIONS"
- meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
- meson test -C "$BUILD_DIR" --setup=valgrind - meson test -C "$BUILD_DIR" --setup=valgrind
variables: variables:
MESON_OPTIONS: "-Dsession-managers=[]" MESON_OPTIONS: "-Dsession-managers=[]"
@ -391,7 +391,7 @@ build_with_coverity:
stage: analysis stage: analysis
script: script:
- export PATH=/opt/coverity/bin:$PATH - export PATH=/opt/coverity/bin:$PATH
- meson "$BUILD_DIR" . --prefix="$PREFIX" - meson setup "$BUILD_DIR" --prefix="$PREFIX"
-Ddocs=disabled -Ddocs=disabled
-Dbluez5-backend-hsphfpd=enabled -Dbluez5-backend-hsphfpd=enabled
-Daudiotestsrc=enabled -Daudiotestsrc=enabled