[geocode-glib/wip/hadess/simplify-ci] ci: Simplify dependencies installation




commit aa64b3f5cea3e86bbdc019a7c6541b0a32872822
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 16 13:52:37 2021 +0200

    ci: Simplify dependencies installation

 .gitlab-ci.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7961bdc..c9115f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,20 @@
 variables:
     LAST_ABI_BREAK: 5cd4856c207e169aa535a9e32f3361b61af639b2
+    COMMON_DEPS:
+      glibc-langpack-fr
+      glibc-langpack-cs
+      glibc-langpack-en
+      glib2-devel
+      json-glib-devel
+      gtk-doc
+      meson
+      git
+      gcc
+      gcc-c++
+      glibc-devel
+      libabigail
+    SOUP2_DEPS:
+      libsoup-devel
 
 build-fedora:
   image: fedora:latest
@@ -7,9 +22,7 @@ build-fedora:
     # Undo delangification present in the Fedora Docker images
     - rm -f /etc/rpm/macros.image-language-conf
     - dnf reinstall -y glib2 glibc
-    # Add locales support required for tests
-    - dnf install -y glibc-langpack-fr glibc-langpack-cs glibc-langpack-en
-    - dnf install -y glib2-devel json-glib-devel libsoup-devel gtk-doc meson git gcc gcc-c++ glibc-devel 
libabigail
+    - dnf install -y $DEPENDENCIES $SOUP2_DEPS
   script:
     - meson _build
     - ninja -C _build install


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