ci: Use meson commands only to setup, compile and install

Old ones are semi-deprecated, so let's adjust to what upstream suggests
This commit is contained in:
Marco Trevisan (Treviño)
2023-06-28 16:11:12 +02:00
parent 5ff794c105
commit 8562f8a964

View File

@@ -42,16 +42,16 @@ image: $FEDORA_IMAGE
.build_one_driver_template: &build_one_driver .build_one_driver_template: &build_one_driver
script: script:
# Build with a driver that doesn't need imaging, or nss # Build with a driver that doesn't need imaging, or nss
- meson --werror -Ddrivers=$driver . _build - meson setup _build --werror -Ddrivers=$driver
- ninja -C _build - meson compile -C _build
- rm -rf _build/ - rm -rf _build/
.build_template: &build .build_template: &build
script: script:
# And build with everything # And build with everything
- meson --werror -Ddrivers=all . _build - meson setup _build --werror -Ddrivers=all
- ninja -C _build - meson compile -C _build
- ninja -C _build install - meson install -C _build
.build_template: &check_abi .build_template: &check_abi
script: script:
@@ -80,10 +80,9 @@ test:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
script: script:
- meson --werror -Ddrivers=all -Db_coverage=true . _build - meson setup _build --werror -Ddrivers=all -Db_coverage=true
- ninja -C _build
- meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3 - meson test -C _build --print-errorlogs --no-stdsplit --timeout-multiplier 3
- ninja -C _build coverage || true # FIXME: always enable this once meson is fixed - ninja -C _build coverage
- cat _build/meson-logs/coverage.txt || true - cat _build/meson-logs/coverage.txt || true
artifacts: artifacts:
reports: reports:
@@ -105,8 +104,8 @@ test_valgrind:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
script: script:
- meson -Ddrivers=all . _build - meson setup _build -Ddrivers=all
- ninja -C _build - meson compile -C _build
- meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind - meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
artifacts: artifacts:
reports: reports:
@@ -147,9 +146,10 @@ test_scan_build:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
allow_failure: true allow_failure: true
script: script:
- meson -Ddrivers=all . _build - meson setup _build -Ddrivers=all
# Wrapper to add --status-bugs and disable malloc checker # Wrapper to add --status-bugs and disable malloc checker
- SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build ninja -C _build scan-build - SCANBUILD=$CI_PROJECT_DIR/.gitlab-ci/scan-build
ninja -C _build scan-build
artifacts: artifacts:
paths: paths:
- _build/meson-logs - _build/meson-logs