Merge branch 'wip/carlosg/ci-f35-and-beyond' into 'master'

ci: Update ci-templates dependency

See merge request GNOME/tracker!483

1 files changed, 21 insertions, 21 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5adf62c27..3d1338a5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 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/alpine.yml'
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/fedora.yml'
-  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/ubuntu.yml'
+  - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/80f87b3058efb75a1faae11826211375fba77e7f/templates/ci-fairy.yml"
+  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/80f87b3058efb75a1faae11826211375fba77e7f/templates/alpine.yml'
+  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/80f87b3058efb75a1faae11826211375fba77e7f/templates/fedora.yml'
+  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/80f87b3058efb75a1faae11826211375fba77e7f/templates/ubuntu.yml'
 
 variables:
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
@@ -60,7 +60,7 @@ check-merge-request:
 
 .tracker.fedora@common:
   variables:
-    BASE_TAG: '2021-08-31.0'
+    BASE_TAG: '2022-02-10.0'
     FDO_UPSTREAM_REPO: GNOME/tracker
     FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip umockdev-devel xmlto uncrustify patch diffutils cmake python-devel'
     FDO_DISTRIBUTION_EXEC: |
@@ -90,10 +90,10 @@ check-merge-request:
     FDO_UPSTREAM_REPO: GNOME/tracker
     FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev vala'
 
-.tracker.fedora:34@x86_64:
+.tracker.fedora:35@x86_64:
   extends: .tracker.fedora@common
   variables:
-    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_VERSION: 35
     FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
 
 .tracker.fedora:rawhide@x86_64:
@@ -102,10 +102,10 @@ check-merge-request:
     FDO_DISTRIBUTION_VERSION: rawhide
     FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
 
-.tracker.fedora:34@aarch64:
+.tracker.fedora:35@aarch64:
   extends: .tracker.fedora@common
   variables:
-    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_VERSION: 35
     FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}"
   tags:
     - aarch64
@@ -125,7 +125,7 @@ check-merge-request:
 build-fedora-container@x86_64:
   extends:
     - .fdo.container-build@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: prepare
   variables:
     GIT_STRATEGY: none
@@ -148,7 +148,7 @@ build-fedora-rawhide-container@x86_64:
 build-fedora-container@aarch64:
   extends:
     - .fdo.container-build@fedora
-    - .tracker.fedora:34@aarch64
+    - .tracker.fedora:35@aarch64
   stage: prepare
   variables:
     GIT_STRATEGY: none
@@ -181,7 +181,7 @@ build-alpine-container@x86_64:
 check-code-style:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   needs:
     - build-fedora-container@x86_64
   stage: code-review
@@ -206,7 +206,7 @@ check-code-style:
 build-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   needs:
     - build-fedora-container@x86_64
   <<: *build
@@ -223,7 +223,7 @@ build-fedora-rawhide@x86_64:
 build-fedora@aarch64:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@aarch64
+    - .tracker.fedora:35@aarch64
   needs:
     - build-fedora-container@aarch64
   allow_failure: true
@@ -286,7 +286,7 @@ build-alpine-edge@x86_64:
 test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   needs:
     - build-fedora@x86_64
   <<: *test
@@ -303,7 +303,7 @@ test-fedora-rawhide@x86_64:
 test-fedora@aarch64:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@aarch64
+    - .tracker.fedora:35@aarch64
   needs:
     - build-fedora@aarch64
   allow_failure: true
@@ -328,7 +328,7 @@ test-alpine@x86_64:
 test-website:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: test
   script:
     - export install_prefix="$(pwd)/tracker-install"
@@ -351,7 +351,7 @@ test-website:
 coverage-analysis:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: analysis
   allow_failure: true
   script:
@@ -372,7 +372,7 @@ coverage-analysis:
 coverity:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: analysis
   allow_failure: true
   script:
@@ -398,7 +398,7 @@ coverity:
 static-scan:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: analysis
   needs:
     - build-fedora-container@x86_64
@@ -413,7 +413,7 @@ static-scan:
 pages:
   extends:
     - .fdo.distribution-image@fedora
-    - .tracker.fedora:34@x86_64
+    - .tracker.fedora:35@x86_64
   stage: website
   script:
     - mv website public