luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 12:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Use meson compile rather than bare ninja

Browse Source 
This makes it more consistent with `meson setup` in the rest of the
file.
This commit is contained in:
Emmanuele Bassi 2023-08-16 11:57:47 +00:00 committed by Philip Withnall
parent 0c73ff3a08
commit 9723c5595c
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.gitlab-ci.yml
View File

@ -118,7 +118,7 @@ fedora-x86_64:
-Dinstalled_tests=true -Dinstalled_tests=true
-Dgtk_doc=true -Dgtk_doc=true
_build _build
- ninja -C _build - meson compile -C _build
- mkdir -p _coverage - mkdir -p _coverage
- lcov --config-file .lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov" - lcov --config-file .lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- .gitlab-ci/run-tests.sh - .gitlab-ci/run-tests.sh
@ -163,7 +163,7 @@ debian-stable-x86_64:
-Dsystemtap=true -Dsystemtap=true
-Ddtrace=true -Ddtrace=true
_build _build
- ninja -C _build - meson compile -C _build
- .gitlab-ci/run-tests.sh - .gitlab-ci/run-tests.sh
artifacts: artifacts:
reports: reports:
@ -194,8 +194,8 @@ installed-tests:
-Ddefault_library=both -Ddefault_library=both
-Ddtrace=false -Ddtrace=false
_build _build
- ninja -C _build - meson compile -C _build
- sudo ninja -C _build install - sudo meson install -C _build
# Remove old headers, possibly present in current installation # Remove old headers, possibly present in current installation
- sudo rm -f /usr/include/glib-2.0/glib/gurifuncs.h - sudo rm -f /usr/include/glib-2.0/glib/gurifuncs.h
- sudo chown -R `id -un`:`id -gn` _build/ - sudo chown -R `id -un`:`id -gn` _build/
@ -231,7 +231,7 @@ G_DISABLE_ASSERT:
-Dinstalled_tests=true -Dinstalled_tests=true
-Dglib_assert=false -Dglib_assert=false
_build _build
- ninja -C _build - meson compile -C _build
- bash -x ./.gitlab-ci/run-tests.sh - bash -x ./.gitlab-ci/run-tests.sh
artifacts: artifacts:
reports: reports:
@ -262,7 +262,7 @@ valgrind:
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
_build _build
- ninja -C _build - meson compile -C _build
# Valgrind doesn’t work when the soft FD limit is set too high # Valgrind doesn’t work when the soft FD limit is set too high
# See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2710 # See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2710
- ulimit -Sn 1024 - ulimit -Sn 1024
@ -299,7 +299,7 @@ cross-android_arm64:
script: script:
# FIXME: add --werror # FIXME: add --werror
- meson setup ${MESON_COMMON_OPTIONS} --cross-file=.gitlab-ci/cross_file_android_arm64_31.txt _build - meson setup ${MESON_COMMON_OPTIONS} --cross-file=.gitlab-ci/cross_file_android_arm64_31.txt _build
- ninja -C _build - meson compile -C _build
cross-mingw64: cross-mingw64:
extends: extends:
@ -311,7 +311,7 @@ cross-mingw64:
script: script:
# FIXME: Add --werror # FIXME: Add --werror
- meson setup ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build - meson setup ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build
- ninja -C _build - meson compile -C _build
artifacts: artifacts:
reports: reports:
junit: junit:
@ -475,7 +475,7 @@ freebsd-12-x86_64:
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404 # FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
# localstatedir is needed for access to /var/lib/dbus/machine-id # localstatedir is needed for access to /var/lib/dbus/machine-id
- meson setup ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build - meson setup ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build
- ninja -C _build - meson compile -C _build
- bash -x ./.gitlab-ci/run-tests.sh - bash -x ./.gitlab-ci/run-tests.sh
artifacts: artifacts:
reports: reports:
@ -504,7 +504,7 @@ freebsd-13-x86_64:
- bash .gitlab-ci/show-execution-environment.sh - bash .gitlab-ci/show-execution-environment.sh
script: script:
- meson setup ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build - meson setup ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build
- ninja -C _build - meson compile -C _build
- bash -x ./.gitlab-ci/run-tests.sh - bash -x ./.gitlab-ci/run-tests.sh
artifacts: artifacts:
reports: reports:
@ -561,7 +561,7 @@ macos-x86_64:
--wrap-mode=default --wrap-mode=default
--werror --werror
_build _build
- ninja -C _build - meson compile -C _build
- .gitlab-ci/run-tests.sh - .gitlab-ci/run-tests.sh
artifacts: artifacts:
reports: reports:
@ -645,7 +645,7 @@ scan-build:
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
_coverity_build _coverity_build
- $HOME/cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C _coverity_build - $HOME/cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C _coverity_build
- tar cfz cov-int.tar.gz cov-int - tar cfz cov-int.tar.gz cov-int
- curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
--form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
@ -680,9 +680,8 @@ dist-job:
- for m in $(git submodule foreach -q 'echo $path'); do git config --global --add safe.directory "${PWD}/${m}"; done - for m in $(git submodule foreach -q 'echo $path'); do git config --global --add safe.directory "${PWD}/${m}"; done
- meson subprojects download - meson subprojects download
- meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Dgtk_doc=true -Dman=true _build - meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Dgtk_doc=true -Dman=true _build
- cd _build - meson dist -C _build
- ninja dist - ninja -C _build glib-doc gobject-doc gio-doc
- ninja glib-doc gobject-doc gio-doc
- tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html - tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html
- tar -c -J -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html - tar -c -J -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html
- tar -c -J -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html - tar -c -J -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html

2
.gitlab-ci/test-msvc.bat
View File

@ -15,7 +15,7 @@ set args=%args:~1%
pip3 install --upgrade --user meson==1.0.0 || goto :error pip3 install --upgrade --user meson==1.0.0 || goto :error
meson setup %args% _build || goto :error meson setup %args% _build || goto :error
python .gitlab-ci/check-missing-install-tag.py _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error
ninja -C _build || goto :error meson compile -C _build || goto :error
meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error
meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky

7
.gitlab-ci/test-msys2.sh
View File

@ -41,8 +41,7 @@ else
meson setup ${MESON_COMMON_OPTIONS} --werror _build meson setup ${MESON_COMMON_OPTIONS} --werror _build
fi fi
cd _build meson compile -C _build
ninja
if [[ "$CFLAGS" == *"-coverage"* ]]; then if [[ "$CFLAGS" == *"-coverage"* ]]; then
lcov \ lcov \
@ -54,8 +53,8 @@ if [[ "$CFLAGS" == *"-coverage"* ]]; then
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
fi fi
meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
meson test -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \ meson test -C _build -v --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
--setup=unstable_tests --suite=failing --suite=flaky || true --setup=unstable_tests --suite=failing --suite=flaky || true
if [[ "$CFLAGS" == *"-coverage"* ]]; then if [[ "$CFLAGS" == *"-coverage"* ]]; then

2
CONTRIBUTING.md
View File

@ -144,7 +144,7 @@ configure your build using Meson:
```sh ```sh
$ meson setup _builddir . $ meson setup _builddir .
$ ninja -C _builddir $ meson compile -C _builddir
``` ```
Typically, you should work on your own branch: Typically, you should work on your own branch:

6
docs/reference/glib/building.xml
View File

@ -23,14 +23,14 @@
<literallayout> <literallayout>
<userinput>meson setup _build</userinput> <userinput>meson setup _build</userinput>
<userinput>ninja -C _build</userinput> <userinput>meson compile -C _build</userinput>
<userinput>ninja -C _build install</userinput> <userinput>meson install -C _build</userinput>
</literallayout> </literallayout>
On FreeBSD: On FreeBSD:
<literallayout> <literallayout>
<userinput>env CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib -Wl,--disable-new-dtags" meson setup -Dxattr=false -Dinstalled_tests=true -Db_lundef=false _build</userinput> <userinput>env CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib -Wl,--disable-new-dtags" meson setup -Dxattr=false -Dinstalled_tests=true -Db_lundef=false _build</userinput>
<userinput>ninja -C _build</userinput> <userinput>meson compile -C _build</userinput>
</literallayout> </literallayout>
</para> </para>