diff options
| author | Oto Šťáva <oto.stava@nic.cz> | 2024-05-27 12:59:51 +0200 |
|---|---|---|
| committer | Oto Šťáva <oto.stava@nic.cz> | 2024-05-27 13:35:08 +0200 |
| commit | 2babf205f404701c03af3b90502ee9e2063d6bdc (patch) | |
| tree | ab3045a3b5bd9060975445ade30729c6925fd4c5 /.gitlab-ci.yml | |
| parent | Merge branch 'coverity' into 'master' (diff) | |
| parent | Merge !1544: modules/stats: split IPv4 and IPv6 stats (version 5.x) (diff) | |
| download | knot-resolver-2babf205f404701c03af3b90502ee9e2063d6bdc.tar.xz knot-resolver-2babf205f404701c03af3b90502ee9e2063d6bdc.zip | |
Non-trivial merge 'master-5' (see 'modules/stats')
modules/stats: adapt aggregate stats to the new hierarchical format
Knot Resolver 6 changed the structure of the stats return value, making
it more hierarchical, i.e. the returned object contains nested
"sub-objects", rather than being flat. This commit adapts the new
aggregate stats to this new structure, for consistency.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f86908d7..e83ecb78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -285,6 +285,7 @@ lint:coverity: --form token=$COVERITY_SCAN_TOKEN --form email="knot-resolver@labs.nic.cz" --form file=@cov-int.tar.gz --form version="`git describe --tags`" --form description="`git describe --tags` / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" + --fail-with-body .kres-gen: &kres-gen <<: *sanity |