summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2021-04-28 21:21:34 +0200
committerAleksander Morgado <aleksander@aleksander.es>2021-04-28 22:13:35 +0200
commitd9072562cd8d03dc72f072a78e73c24fe4193b8a (patch)
treec3e525b13cc14682448d80b807decf681f91a10c /.gitlab-ci.yml
parent1051dd162c0b70074b71517282f142833d2b7422 (diff)
ci: use latest ubuntu LTS by default
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml30
1 files changed, 17 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fce111f..64b46533 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ include:
- project: freedesktop/ci-templates
ref: 290b79e0e78eab67a83766f4e9691be554fc4afd
file:
- - templates/debian.yml
+ - templates/ubuntu.yml
stages:
- container prep
@@ -11,14 +11,18 @@ stages:
.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
+ FDO_DISTRIBUTION_VERSION: '20.04'
+ FDO_DISTRIBUTION_TAG: '2021-04-28.2'
+ 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
+ - .fdo.container-build@ubuntu
- .common_variables
stage: container prep
only:
@@ -31,7 +35,7 @@ build container:
build-no-qmi:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master
@@ -55,7 +59,7 @@ build-no-qmi:
build-qmi-qrtr-no-mbim:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master
@@ -86,7 +90,7 @@ build-qmi-qrtr-no-mbim:
build-qmi-no-qrtr-no-mbim:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master
@@ -110,7 +114,7 @@ build-qmi-no-qrtr-no-mbim:
build-no-qmi-no-mbim:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master
@@ -127,7 +131,7 @@ build-no-qmi-no-mbim:
build-qmi-newest-commands:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master
@@ -151,7 +155,7 @@ build-qmi-newest-commands:
build-single-plugins:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- schedules
@@ -192,7 +196,7 @@ build-single-plugins:
build-default:
stage: build
extends:
- - .fdo.distribution-image@debian
+ - .fdo.distribution-image@ubuntu
- .common_variables
only:
- master