isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Use backend-agnostic meson commands

Browse Source 
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/gnome-shell/-/merge_requests/1937>
This commit is contained in:
Florian Müllner 2021-08-05 03:46:53 +02:00 committed by Marge Bot
parent bf5129adc1
commit 0cd882697a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -190,11 +190,11 @@ build:
before_script: before_script:
- .gitlab-ci/checkout-mutter.sh - .gitlab-ci/checkout-mutter.sh
- meson mutter mutter/build --prefix=/usr - meson mutter mutter/build --prefix=/usr
- ninja -C mutter/build install - meson install -C mutter/build
script: script:
- meson . build -Dbuildtype=debugoptimized -Dman=false --werror - meson . build -Dbuildtype=debugoptimized -Dman=false --werror
- 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:
@ -208,7 +208,7 @@ test:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
NO_AT_BRIDGE: "1" NO_AT_BRIDGE: "1"
before_script: before_script:
- ninja -C mutter/build install - meson install -C mutter/build
script: script:
- dbus-run-session -- xvfb-run meson test -C build --no-rebuild - dbus-run-session -- xvfb-run meson test -C build --no-rebuild
artifacts: artifacts:
@ -226,11 +226,11 @@ test-coverity:
stage: analyze stage: analyze
allow_failure: true allow_failure: true
before_script: before_script:
- ninja -C mutter/build install - meson compile -C mutter/build
script: script:
- .gitlab-ci/download-coverity-tarball.sh - .gitlab-ci/download-coverity-tarball.sh
- CC=clang meson coverity-build -Dman=false - CC=clang meson coverity-build -Dman=false
- ./coverity/cov-analysis-linux64-*/bin/cov-build --fs-capture-search js --dir cov-int ninja -C coverity-build - ./coverity/cov-analysis-linux64-*/bin/cov-build --fs-capture-search js --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=GNOME+Shell - curl https://scan.coverity.com/builds?project=GNOME+Shell
--form token=$COVERITY_TOKEN --form email=carlosg@gnome.org --form token=$COVERITY_TOKEN --form email=carlosg@gnome.org

2
.gitlab-ci/install-meson-project.sh
View File

@ -28,7 +28,7 @@ pushd "$REPO_DIR"
pushd "$SUBDIR" pushd "$SUBDIR"
sh -c "$PREPARE" sh -c "$PREPARE"
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"