brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Stop running meson without subcommand

Browse Source 
Invoking meson with no command is deprecated in favor of
`meson setup`.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3010>
This commit is contained in:
Florian Müllner 2023-05-18 18:57:48 +02:00
parent 3b7ca42c6f
commit 73ac37e751
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -66,7 +66,7 @@ variables:
dnf clean all && dnf clean all &&
if [[ x"$(uname -m )" = "xx86_64" ]] ; then if [[ x"$(uname -m )" = "xx86_64" ]] ; then
meson build -Dkvm_tests=true && meson setup build -Dkvm_tests=true &&
ninja -C build src/tests/kvm/bzImage && ninja -C build src/tests/kvm/bzImage &&
mkdir -p /opt/mutter && mkdir -p /opt/mutter &&
cp build/src/tests/kvm/bzImage /opt/mutter/bzImage && cp build/src/tests/kvm/bzImage /opt/mutter/bzImage &&
@ -235,7 +235,7 @@ check-code-style:
- .build-mutter-base - .build-mutter-base
stage: build stage: build
script: script:
- meson . build - meson setup . build
--prefix /usr --prefix /usr
--werror --werror
--fatal-meson-warnings --fatal-meson-warnings
@ -277,7 +277,7 @@ build-without-opengl-and-glx@x86_64:
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build --werror --prefix /usr - meson setup . build --werror --prefix /usr
-Dbuildtype=debugoptimized -Dbuildtype=debugoptimized
-Dopengl=false -Dopengl=false
-Dglx=false -Dglx=false
@ -297,7 +297,7 @@ build-without-native-backend-and-wayland@x86_64:
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build --werror --prefix /usr - meson setup . build --werror --prefix /usr
-Dbuildtype=debugoptimized -Dbuildtype=debugoptimized
-Dnative_backend=false -Dnative_backend=false
-Dudev=false -Dudev=false
@ -319,7 +319,7 @@ build-wayland-only@x86_64:
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build --werror --prefix /usr - meson setup . build --werror --prefix /usr
-Dbuildtype=debugoptimized -Dbuildtype=debugoptimized
-Dwayland=true -Dwayland=true
-Dxwayland=false -Dxwayland=false
@ -463,7 +463,7 @@ can-build-gnome-shell@x86_64:
- meson install --no-rebuild -C build - meson install --no-rebuild -C build
script: script:
- .gitlab-ci/checkout-gnome-shell.sh - .gitlab-ci/checkout-gnome-shell.sh
- meson gnome-shell gnome-shell/build --prefix /usr -Dman=false - meson setup gnome-shell gnome-shell/build --prefix /usr -Dman=false
- meson install -C gnome-shell/build - meson install -C gnome-shell/build
test-mutter-coverity: test-mutter-coverity:
@ -481,7 +481,7 @@ test-mutter-coverity:
allow_failure: true allow_failure: true
script: script:
- .gitlab-ci/download-coverity-tarball.sh - .gitlab-ci/download-coverity-tarball.sh
- CC=clang meson coverity-build -Dprofiler=false - CC=clang meson setup coverity-build -Dprofiler=false
- ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C coverity-build - ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C coverity-build
- tar czf cov-int.tar.gz cov-int - tar czf cov-int.tar.gz cov-int
- curl https://scan.coverity.com/builds?project=mutter - curl https://scan.coverity.com/builds?project=mutter
@ -503,7 +503,7 @@ dist-mutter:
needs: needs:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build --werror --prefix /usr - meson setup . build --werror --prefix /usr
-Dbuildtype=debugoptimized -Dbuildtype=debugoptimized
- glib-compile-schemas $GSETTINGS_SCHEMA_DIR - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
- xvfb-run -a -s "$XVFB_SERVER_ARGS" - xvfb-run -a -s "$XVFB_SERVER_ARGS"
@ -534,7 +534,7 @@ reference:
- job: build-fedora-container@x86_64 - job: build-fedora-container@x86_64
artifacts: false artifacts: false
script: script:
- meson . build --werror -Ddocs=true -Dtests=false - meson setup . build --werror -Ddocs=true -Dtests=false
- ninja -C build - ninja -C build
- mkdir references - mkdir references
- mv build/doc/reference/{cally/cally,clutter/clutter,cogl/cogl,cogl-pango/cogl-pango,meta/meta} references/ - mv build/doc/reference/{cally/cally,clutter/clutter,cogl/cogl,cogl-pango/cogl-pango,meta/meta} references/