diff options
author | Jens Georg <mail@jensge.org> | 2022-05-25 11:09:11 +0200 |
---|---|---|
committer | Jens Georg <mail@jensge.org> | 2022-05-25 11:20:48 +0200 |
commit | 6d217227b9a0fa7836b1fa5639950af94c48617b (patch) | |
tree | b102625e3d95d29a4d94de88c2cd57523e1c13d0 /.gitlab-ci.yml | |
parent | 33b20facb04ae6f296d44bcd8318848ee9cde2b8 (diff) | |
download | gupnp-6d217227b9a0fa7836b1fa5639950af94c48617b.tar.gz |
ci: Bump image to f36, drop custom libsoup
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08b797a..6e4b8ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,10 +52,6 @@ check-merge-request: .build-template: &build stage: build script: - - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup - - meson _build --prefix=/usr -Dtls_check=false -Ddocs=disabled - - ninja -C _build install - - popd - meson . build --prefix=/usr -Db_coverage=true - ninja -C build artifacts: @@ -65,30 +61,23 @@ check-merge-request: .gupnp.fedora@common: variables: - BASE_TAG: '2022-02-12.0' + BASE_TAG: '2022-05-25.0' FDO_UPSTREAM_REPO: GNOME/gupnp - FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip xmlto gobject-introspection-devel gtk-doc libsoup-devel libuuid-devel libxml2-devel vala ninja-build libnghttp2-devel libpsl-devel sqlite-devel' + FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip xmlto gobject-introspection-devel gtk-doc libsoup3-devel libuuid-devel libxml2-devel vala ninja-build python3-setuptools' FDO_DISTRIBUTION_EXEC: | dnf clean all && pip3 install meson markdown gi-docgen jinja2 Markdown markupsafe pygments toml typogrify -.soup3: - before_script: - - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup - - meson _build --prefix=/usr -Dtls_check=false -Ddocs=disabled - - ninja -C _build install - - popd - -.gupnp.fedora:35@x86_64: +.gupnp.fedora:36@x86_64: extends: .gupnp.fedora@common variables: - FDO_DISTRIBUTION_VERSION: 35 + FDO_DISTRIBUTION_VERSION: 36 FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" build-fedora-container@x86_64: extends: - .fdo.container-build@fedora - - .gupnp.fedora:35@x86_64 + - .gupnp.fedora:36@x86_64 stage: prepare variables: GIT_STRATEGY: none @@ -97,7 +86,7 @@ build-fedora-container@x86_64: build-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .gupnp.fedora:35@x86_64 + - .gupnp.fedora:36@x86_64 needs: - build-fedora-container@x86_64 <<: *build @@ -139,8 +128,7 @@ build-fedora@x86_64: test-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .gupnp.fedora:35@x86_64 - - .soup3 + - .gupnp.fedora:36@x86_64 needs: - build-fedora@x86_64 <<: *test @@ -156,7 +144,7 @@ test-fedora@x86_64: coverage-analysis: extends: - .fdo.distribution-image@fedora - - .gupnp.fedora:35@x86_64 + - .gupnp.fedora:36@x86_64 stage: analysis allow_failure: true script: @@ -174,8 +162,7 @@ coverage-analysis: static-scan: extends: - .fdo.distribution-image@fedora - - .gupnp.fedora:35@x86_64 - - .soup3 + - .gupnp.fedora:36@x86_64 stage: analysis needs: - build-fedora-container@x86_64 @@ -190,8 +177,7 @@ static-scan: pages: extends: - .fdo.distribution-image@fedora - - .gupnp.fedora:35@x86_64 - - .soup3 + - .gupnp.fedora:36@x86_64 stage: website script: - meson doc-build -Dgtk_doc=true |