ci: Use backend-agnostic meson command to build

There's no alternative backend in sight for us, but it's nice to
only deal with a single build tool.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957>
This commit is contained in:
Florian Müllner 2021-08-05 14:57:09 +02:00 committed by Marge Bot
parent 6288763671
commit 7eb68b43a9
2 changed files with 9 additions and 9 deletions

View File

@ -146,8 +146,8 @@ build-fedora-container@aarch64:
stage: build stage: build
script: script:
- meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Db_coverage=true -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build - meson compile -C build
- ninja -C build install - meson install -C build
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
@ -176,8 +176,8 @@ build-without-opengl-and-glx@x86_64:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Dopengl=false -Dglx=false -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build - meson compile -C build
- ninja -C build install - meson install -C build
artifacts: artifacts:
paths: paths:
- build/meson-logs - build/meson-logs
@ -191,8 +191,8 @@ build-without-native-backend-and-wayland@x86_64:
- build-fedora-container@x86_64 - build-fedora-container@x86_64
script: script:
- meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false -Dnative_tests=false --werror --prefix /usr - meson . build -Dbuildtype=debugoptimized -Dnative_backend=false -Dudev=false -Dwayland=false -Dcore_tests=false -Dnative_tests=false --werror --prefix /usr
- ninja -C build - meson compile -C build
- ninja -C build install - meson install -C build
artifacts: artifacts:
paths: paths:
- build/meson-logs - build/meson-logs
@ -271,7 +271,7 @@ can-build-gnome-shell@x86_64:
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 gnome-shell gnome-shell/build --prefix /usr -Dman=false
- ninja -C gnome-shell/build install - meson install -C gnome-shell/build
test-mutter-coverity: test-mutter-coverity:
rules: rules:
@ -288,7 +288,7 @@ test-mutter-coverity:
script: script:
- .gitlab-ci/download-coverity-tarball.sh - .gitlab-ci/download-coverity-tarball.sh
- CC=clang meson coverity-build -Dprofiler=false - CC=clang meson coverity-build -Dprofiler=false
- ./coverity/cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -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
--form token=$COVERITY_TOKEN --form email=carlosg@gnome.org --form token=$COVERITY_TOKEN --form email=carlosg@gnome.org

View File

@ -33,7 +33,7 @@ if [ ! -z "$COMMIT" ]; then
fi fi
meson --prefix=/usr _build "${MESON_OPTIONS[@]}" meson --prefix=/usr _build "${MESON_OPTIONS[@]}"
ninja -C _build install meson install -C _build
popd popd
popd popd
rm -rf "$REPO_DIR" rm -rf "$REPO_DIR"