aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2021-04-08 10:07:45 +0200
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2021-04-08 11:39:48 +0200
commit01f2109ae0bb8ac9a966f69f88ec2b526b68269b (patch)
tree2bcf055dc00eba06f821410ba567c4267042d254
parent179e12befc6daa8048a3f1adffaa24a1d62ddcae (diff)
CI: make use of ci-templates
full list of benefits at: https://freedesktop.pages.freedesktop.org/ci-templates/templates.html#why-use-the-ci-templates But the main ones are: - reproducible (just download the container and run the `script` part to be in the same environment the CI was running) - no more before script that pulls hundreds of MB and spend useless time. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-rw-r--r--.gitlab-ci.yml48
1 files changed, 43 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8371f75..f031fd08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,38 @@
-image: gcc
+include:
+ - project: freedesktop/ci-templates
+ ref: 290b79e0e78eab67a83766f4e9691be554fc4afd
+ file:
+ - templates/debian.yml
stages:
+ - container prep
- build
-before_script:
- - apt update || true
- - apt -y install autoconf automake libtool libgettextpo-dev libgirepository1.0-dev libglib2.0-dev libgudev-1.0-dev python3-dbus python3-gi autopoint xsltproc dbus autoconf-archive gettext
+.common_variables:
+ variables:
+ FDO_UPSTREAM_REPO: mobile-broadband/ModemManager
+ FDO_DISTRIBUTION_VERSION: 'buster'
+ FDO_DISTRIBUTION_TAG: '2020-04-08.4'
+ FDO_DISTRIBUTION_PACKAGES: ca-certificates git gcc autoconf automake libtool libgettextpo-dev libgirepository1.0-dev libglib2.0-dev libgudev-1.0-dev python3-dbus python3-gi autopoint xsltproc dbus autoconf-archive gettext
+ gtk-doc-tools libglib2.0-doc gobject-introspection libsystemd-dev libpolkit-gobject-1-dev valac
+
+build container:
+ extends:
+ - .fdo.container-build@debian
+ - .common_variables
+ stage: container prep
+ only:
+ - master
+ - branches
+ - merge_requests
+ - tags
+ - pushes
build-no-qmi:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- master
- merge_requests
@@ -30,6 +54,9 @@ build-no-qmi:
build-no-mbim:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- master
- merge_requests
@@ -51,6 +78,9 @@ build-no-mbim:
build-no-qmi-no-mbim:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- master
- merge_requests
@@ -65,6 +95,9 @@ build-no-qmi-no-mbim:
build-qmi-newest-commands:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- master
- merge_requests
@@ -86,6 +119,9 @@ build-qmi-newest-commands:
build-single-plugins:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- schedules
script:
@@ -117,6 +153,9 @@ build-single-plugins:
build-default:
stage: build
+ extends:
+ - .fdo.distribution-image@debian
+ - .common_variables
only:
- master
- branches
@@ -125,7 +164,6 @@ build-default:
- schedules
- pushes
script:
- - apt -y install gtk-doc-tools libglib2.0-doc gobject-introspection libsystemd-dev libpolkit-gobject-1-dev valac
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
- pushd libmbim
- NOCONFIGURE=1 ./autogen.sh