[gssdp/wip/ci] ci: wip
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gssdp/wip/ci] ci: wip
- Date: Sat, 12 Feb 2022 12:43:14 +0000 (UTC)
commit a1bb796547c6417e85ff86822faa04e5bb09d89b
Author: Jens Georg <mail jensge org>
Date: Sat Feb 12 13:34:43 2022 +0100
ci: wip
.gitlab-ci.yml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c3359..5c80498 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ check-merge-request:
<<: *check
.build-template: &build
+ extends: .soup3
stage: build
script:
- meson . build --prefix=/usr -Db_coverage=true
@@ -71,17 +72,20 @@ check-merge-request:
dnf clean all &&
pip3 install meson markdown gi-docgen jinja2 Markdown markupsafe pygments toml typogrify
-.gssdp.fedora:35@x86_64:
- extends: .gssdp.fedora@common
- variables:
- FDO_DISTRIBUTION_VERSION: 35
- FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+.soup3:
before_script:
- git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
- meson _build --prefix=/usr -Dtls_check=false -Dgtk_doc=false
- ninja -C _build install
- popd
+.gssdp.fedora:35@x86_64:
+ extends:
+ - .gssdp.fedora@common
+ variables:
+ FDO_DISTRIBUTION_VERSION: 35
+ FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+
build-fedora-container@x86_64:
extends:
- .fdo.container-build@fedora
@@ -137,6 +141,7 @@ test-fedora@x86_64:
extends:
- .fdo.distribution-image@fedora
- .gssdp.fedora:35@x86_64
+ - .soup3
needs:
- build-fedora@x86_64
<<: *test
@@ -171,6 +176,7 @@ static-scan:
extends:
- .fdo.distribution-image@fedora
- .gssdp.fedora:35@x86_64
+ - .soup3
stage: analysis
needs:
- build-fedora-container@x86_64
@@ -191,6 +197,7 @@ pages:
extends:
- .fdo.distribution-image@fedora
- .gssdp.fedora:35@x86_64
+ - .soup3
stage: website
script:
- meson doc-build -Dgtk_doc=true
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]