diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2023-07-17 15:54:47 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2023-07-17 16:08:28 -0400 |
| commit | 60db3b6303aa873b81a0c224b76c524292a75cff (patch) | |
| tree | ff7223a32817294a8d160a7864c3c19f19164010 | |
| parent | 4b63250cc446e25b5150dd6040028624ee76f9d1 (diff) | |
gitlab-ci: Move Coverity build to Fedora 38
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rwxr-xr-x | tests/docker/fedora38/pip-installs.sh | 5 |
2 files changed, 24 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1615a84..4ce31a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,8 @@ include: file: '/templates/ci-fairy.yml' - project: 'freedesktop/ci-templates' file: '/templates/centos.yml' + - project: 'freedesktop/ci-templates' + file: '/templates/fedora.yml' .libnice.centos:7: variables: @@ -28,6 +30,12 @@ include: FDO_DISTRIBUTION_TAG: '2022-10-17-cov' FDO_UPSTREAM_REPO: 'libnice/libnice' +.libnice.fedora:38: + variables: + FDO_DISTRIBUTION_VERSION: '38' + FDO_DISTRIBUTION_TAG: '2023-07-17' + FDO_UPSTREAM_REPO: 'libnice/libnice' + check-allow-collaboration: extends: - .fdo.ci-fairy @@ -51,6 +59,15 @@ build-centos-container:7: FDO_DISTRIBUTION_PACKAGES: 'git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind net-tools centos-release-scl graphviz' FDO_DISTRIBUTION_EXEC: 'tests/docker/centos7-meson/pip-installs.sh' +build-fedora-container:38: + extends: + - .fdo.container-build@fedora # the CI template + - .libnice.fedora:38 # our template job above + stage: containers + variables: + FDO_DISTRIBUTION_PACKAGES: 'git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind net-tools graphviz meson ninja-build lcov python3-pip' + FDO_DISTRIBUTION_EXEC: 'tests/docker/fedora38/pip-installs.sh' + build: stage: build extends: @@ -283,8 +300,8 @@ doc-and-install: submit-to-coverity: stage: test extends: - - .fdo.distribution-image@centos - - .libnice.centos:7 + - .fdo.distribution-image@fedora + - .libnice.fedora:38 variables: COVERITY_PROJECT: libnice PREFIX: "${CI_PROJECT_DIR}/libnice-prefix" @@ -297,7 +314,6 @@ submit-to-coverity: script: - curl -v https://scan.coverity.com/download/linux64 -o coverity_tool.tgz --data "token=${COVERITY_TOKEN}&project=${COVERITY_PROJECT}" && tar xf coverity_tool.tgz && rm coverity_tool.tgz - mv cov-analysis-linux64-* cov-analysis-linux64 - - source scl_source enable rh-python36 && true - meson --werror --warnlevel 2 -Dgtk_doc=disabled -Dintrospection=disabled --prefix=$PREFIX cov-build/ - export PATH="$PATH:${CI_PROJECT_DIR}/cov-analysis-linux64/bin" - echo $PATH diff --git a/tests/docker/fedora38/pip-installs.sh b/tests/docker/fedora38/pip-installs.sh new file mode 100755 index 0000000..5c9ffd1 --- /dev/null +++ b/tests/docker/fedora38/pip-installs.sh @@ -0,0 +1,5 @@ +#/bin/sh + +set -ex + +pip3 install lcov-cobertura |