[gnome-control-center/wip/hadess/bump-gsd-req] fixup! ci: Build gnome-settings-daemon in CI




commit 07b1bffd97be45b4814917a874f508960d6c91a1
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Oct 16 22:42:35 2021 +0200

    fixup! ci: Build gnome-settings-daemon in CI

 .gitlab-ci.yml | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55ec77244..8c6104b24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,6 +122,24 @@ build.container.fedora@x86_64:
         ninja -C _build install && \
         cd ..
 
+.Install gsd deps: &install_gsd_deps
+  dnf -y install
+      geocode-glib-devel
+      libgweather-devel
+      lcms2-devel
+      geoclue2-devel
+      libnotify-devel
+      alsa-lib-devel
+      nss-devel
+
+.Install gsd: &install_gsd
+  git clone https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git &&
+      cd gnome-settings-daemon &&
+      meson . _build --prefix=/usr &&
+      ninja -C _build &&
+      ninja -C _build install &&
+      cd ..
+
 ##
 # Stage: Build
 #
@@ -139,20 +157,8 @@ build:
 
   script:
     - dnf -y install gcr-devel
-    - dnf -y install
-        geocode-glib-devel
-        libgweather-devel
-        lcms2-devel
-        geoclue2-devel
-        libnotify-devel
-        alsa-lib-devel
-        nss-devel
-    - git clone https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git &&
-        cd gnome-settings-daemon &&
-        meson . _build --prefix=/usr &&
-        ninja -C _build &&
-        ninja -C _build install &&
-        cd ..
+    - *install_gsd_deps
+    - *install_gsd
     - *environment_information
     - *build_procedure
 
@@ -186,6 +192,8 @@ test:
 
   script:
     - dnf -y install gcr-devel
+    - *install_gsd_deps
+    - *install_gsd
     - *environment_information
     - *run_tests
 
@@ -215,6 +223,8 @@ coverage:
 
   script:
     - dnf -y install gcr-devel
+    - *install_gsd_deps
+    - *install_gsd
     - *environment_information
     - *build_procedure
     - *run_tests
@@ -331,6 +341,8 @@ flatpak:
   when: manual
   script:
     - dnf -y install gcr-devel
+    - *install_gsd_deps
+    - *install_gsd
     - *environment_information
     - *build_procedure
     - *run_tests


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