summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2021-09-16 13:52:37 +0200
committerBastien Nocera <hadess@hadess.net>2021-09-16 14:00:52 +0200
commit2eae640d849f317894a270a3703b9ad905580771 (patch)
treea6161cb60a612204628526c4dda4804b29cc1341
parentb47fc823000fb7fcaa933fe9c66280d3f64a15db (diff)
downloadgeocode-glib-2eae640d849f317894a270a3703b9ad905580771.tar.gz
ci: Simplify dependencies installation
-rw-r--r--.gitlab-ci.yml19
1 files changed, 16 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7961bdc..d45a435 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 $COMMON_DEPS $SOUP2_DEPS
script:
- meson _build
- ninja -C _build install