diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed76e71..7148490 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/ci-fairy.yml" - - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/fedora.yml' + - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/0c312d9c7255f46e741d43bcd1930f09cd12efe7/templates/ci-fairy.yml" + - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/0c312d9c7255f46e741d43bcd1930f09cd12efe7/templates/fedora.yml' variables: MESON_TEST_TIMEOUT_MULTIPLIER: 3 @@ -61,23 +61,23 @@ check-merge-request: .gupnp_tools.fedora@common: variables: - BASE_TAG: '2021-06-19.0' + BASE_TAG: '2022-05-20.0' FDO_UPSTREAM_REPO: GNOME/gupnp-tools - 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 gtk3-devel gtksourceview4-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 gtk3-devel gtksourceview4-devel' FDO_DISTRIBUTION_EXEC: | dnf clean all && pip3 install meson -.gupnp_tools.fedora:34@x86_64: +.gupnp_tools.fedora:36@x86_64: extends: .gupnp_tools.fedora@common variables: - FDO_DISTRIBUTION_VERSION: 34 + FDO_DISTRIBUTION_VERSION: 36 FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" build-fedora-container@x86_64: extends: - .fdo.container-build@fedora - - .gupnp_tools.fedora:34@x86_64 + - .gupnp_tools.fedora:36@x86_64 stage: prepare variables: GIT_STRATEGY: none @@ -86,7 +86,7 @@ build-fedora-container@x86_64: build-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .gupnp_tools.fedora:34@x86_64 + - .gupnp_tools.fedora:36@x86_64 needs: - build-fedora-container@x86_64 <<: *build @@ -128,7 +128,7 @@ build-fedora@x86_64: test-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .gupnp_tools.fedora:34@x86_64 + - .gupnp_tools.fedora:36@x86_64 needs: - build-fedora@x86_64 <<: *test @@ -144,7 +144,7 @@ test-fedora@x86_64: #coverage-analysis: # extends: # - .fdo.distribution-image@fedora -# - .gupnp_tools.fedora:34@x86_64 +# - .gupnp_tools.fedora:36@x86_64 # stage: analysis # allow_failure: true # script: @@ -162,7 +162,7 @@ test-fedora@x86_64: static-scan: extends: - .fdo.distribution-image@fedora - - .gupnp_tools.fedora:34@x86_64 + - .gupnp_tools.fedora:36@x86_64 stage: analysis needs: - build-fedora-container@x86_64 @@ -177,7 +177,7 @@ static-scan: #pages: # extends: # - .fdo.distribution-image@fedora -# - .gupnp_tools.fedora:34@x86_64 +# - .gupnp_tools.fedora:36@x86_64 # stage: website # script: # - meson doc-build -Dgtk_doc=true |