Merge branch 'wip/dueno/gitlab-ci-fixes' into 'master'

.gitlab-ci.yml: install diffutils

See merge request GNOME/libsecret!50
This commit is contained in:
Daiki Ueno 2020-03-10 13:20:07 +00:00
commit 9adf321442

View File

@ -3,7 +3,7 @@ stages:
- deploy - deploy
variables: variables:
DEPENDENCIES: dbus-x11 gcc gjs meson ninja-build python3-dbus python3-gobject redhat-rpm-config DEPENDENCIES: dbus-x11 diffutils gcc gjs meson ninja-build python3-dbus python3-gobject redhat-rpm-config
fedora:Werror: fedora:Werror:
image: fedora:latest image: fedora:latest
@ -18,6 +18,10 @@ fedora:Werror:
- meson _build -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations - meson _build -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations
- eval `dbus-launch --sh-syntax` - eval `dbus-launch --sh-syntax`
- meson test -C _build - meson test -C _build
artifacts:
when: on_failure
paths:
- _build/meson-logs/testlog.txt
fedora:asan: fedora:asan:
image: fedora:latest image: fedora:latest
@ -32,6 +36,10 @@ fedora:asan:
- meson _build -Dsanitize=address - meson _build -Dsanitize=address
- eval `dbus-launch --sh-syntax` - eval `dbus-launch --sh-syntax`
- meson test -C _build - meson test -C _build
artifacts:
when: on_failure
paths:
- _build/meson-logs/testlog.txt
fedora:ubsan: fedora:ubsan:
image: fedora:latest image: fedora:latest
@ -46,6 +54,10 @@ fedora:ubsan:
- meson _build -Dsanitize=undefined - meson _build -Dsanitize=undefined
- eval `dbus-launch --sh-syntax` - eval `dbus-launch --sh-syntax`
- meson test -C _build - meson test -C _build
artifacts:
when: on_failure
paths:
- _build/meson-logs/testlog.txt
fedora:coverage: fedora:coverage:
image: fedora:latest image: fedora:latest
@ -64,6 +76,7 @@ fedora:coverage:
coverage: '/^\s+lines.+:\s+([\d.]+\%)\s+/' coverage: '/^\s+lines.+:\s+([\d.]+\%)\s+/'
artifacts: artifacts:
name: "libsecret-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}" name: "libsecret-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: on_success
paths: paths:
- _build/meson-logs/coveragereport/ - _build/meson-logs/coveragereport/
# https://github.com/linux-test-project/lcov/issues/58 # https://github.com/linux-test-project/lcov/issues/58