diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-08-13 05:48:48 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-08-13 05:48:48 +0000 |
| commit | 34dac1e80581acc8874be067da639aa67d275de7 (patch) | |
| tree | 9fe0170e4618a81a9787d19d307aef22f54c4ff7 | |
| parent | 4e79431f4b99f91622443a402d354d332b727198 (diff) | |
| parent | 4017d2ec510d695bb53c4187a3f521cdb522da51 (diff) | |
| download | libsecret-34dac1e80581acc8874be067da639aa67d275de7.tar.gz | |
Merge branch 'wip/dueno/coverage-location' into 'master'
ci: Fix artifact location for coverage
See merge request GNOME/libsecret!92
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 731d02d..aad0fe4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: - deploy variables: - DEPENDENCIES: dbus-x11 diffutils gcc gjs meson ninja-build python3-dbus python3-gobject redhat-rpm-config tpm2-tss-devel + DEPENDENCIES: dbus-x11 diffutils gcc gjs meson ninja-build python3-dbus python3-gobject redhat-rpm-config CPPCHECK_OPTIONS: "--enable=warning --enable=style --enable=performance --enable=portability --std=c99 --template='{id}:{file}:{line},{severity},{message}'" fedora:Werror: @@ -13,19 +13,12 @@ fedora:Werror: - dnf upgrade -y - dnf install -y 'dnf-command(builddep)' - dnf builddep -y libsecret - - dnf install -y $DEPENDENCIES swtpm swtpm-tools tpm2-abrmd + - dnf install -y $DEPENDENCIES - dbus-uuidgen --ensure script: - - export XDG_CONFIG_HOME=$HOME/.config - - /usr/share/swtpm/swtpm-create-user-config-files --root - - mkdir -p ${XDG_CONFIG_HOME}/mytpm1 - - swtpm_setup --tpm2 --tpmstate $XDG_CONFIG_HOME/mytpm1 --createek --allow-signing --decryption --create-ek-cert --create-platform-cert --lock-nvram --overwrite --display - - swtpm socket --tpm2 --tpmstate dir=$XDG_CONFIG_HOME/mytpm1 --flags startup-clear --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --daemon - - eval `dbus-launch --sh-syntax` - - 'tpm2-abrmd --logger=stdout --tcti=swtpm: --session --allow-root --flush-all &' - - 'export TCTI=tabrmd:bus_type=session' - - meson _build -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations -Dtpm2=true + - meson _build -Dwerror=true -Dc_args=-Wno-error=deprecated-declarations - meson compile -C _build + - eval `dbus-launch --sh-syntax` - meson test -C _build artifacts: when: on_failure @@ -95,12 +88,20 @@ fedora:coverage: - dnf upgrade -y - dnf install -y 'dnf-command(builddep)' - dnf builddep -y libsecret + - dnf install -y $DEPENDENCIES swtpm swtpm-tools tpm2-abrmd tpm2-tss-devel - dnf install -y $DEPENDENCIES lcov - dbus-uuidgen --ensure script: - - meson _build -Db_coverage=true + - meson _build -Db_coverage=true -Dtpm2=true - meson compile -C _build - eval `dbus-launch --sh-syntax` + - export XDG_CONFIG_HOME=$HOME/.config + - /usr/share/swtpm/swtpm-create-user-config-files --root + - mkdir -p ${XDG_CONFIG_HOME}/mytpm1 + - swtpm_setup --tpm2 --tpmstate $XDG_CONFIG_HOME/mytpm1 --createek --allow-signing --decryption --create-ek-cert --create-platform-cert --lock-nvram --overwrite --display + - swtpm socket --tpm2 --tpmstate dir=$XDG_CONFIG_HOME/mytpm1 --flags startup-clear --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --daemon + - 'tpm2-abrmd --logger=stdout --tcti=swtpm: --session --allow-root --flush-all &' + - 'export TCTI=tabrmd:bus_type=session' - meson test -C _build - ninja coverage-html -C _build coverage: '/^\s+lines.+:\s+([\d.]+\%)\s+/' @@ -115,7 +116,8 @@ fedora:coverage: pages: stage: deploy script: - - mv _build/meson-logs/coveragereport/ public/ + - mkdir public + - mv _build/meson-logs/coveragereport public/coverage artifacts: when: on_success paths: |