[tracker/wip/carlosg/test] foo




commit 00cc96e50df7d6895cb5219d38f811dc2889c235
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Aug 27 21:23:03 2021 +0200

    foo

 .gitlab-ci.yml | 4 ++--
 meson.build    | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfc455a9..bbd1c02b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ check-merge-request:
 
 .tracker.fedora@common:
   variables:
-    BASE_TAG: '2021-06-13.2'
+    BASE_TAG: '2021-07-31.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'
     FDO_DISTRIBUTION_EXEC: |
@@ -192,7 +192,7 @@ check-code-style:
     - meson . build -Db_lto=true -Db_coverage=true -Dsystemd_user_services=false -Dtests_tap_protocol=true 
--prefix /usr
     - ninja -C build
     - |
-      if [ -z "$NO_DOCS" ]; then ninja -C build libtracker-sparql-3-doc ontology-3-doc; fi
+      if [ -z "$NO_DOCS" ]; then ninja -C build docs/reference/libtracker-sparql/docs ontology-3-doc; fi
   artifacts:
     expire_in: 1 day
     paths:
diff --git a/meson.build b/meson.build
index 1d5dc69cb..ebd943a27 100644
--- a/meson.build
+++ b/meson.build
@@ -74,11 +74,6 @@ endif
 gidocgen = dependency('gi-docgen', version: '>= 2021.1', fallback: ['gi-docgen', 'dummy_dep'])
 gidocgen = find_program('gi-docgen')
 
-if get_option('soup2')
-  libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)
-else
-  libsoup = dependency('libsoup-3.0', version: '>= 2.99.2', required: true)
-
 if get_option('man')
   asciidoc = find_program('asciidoc')
   xsltproc = find_program('xsltproc')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]