fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-24 13:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: move a few sections around

Browse source 
Move the centos builds to after the ubuntu builds and swap the two fedora
builds. Just we have the same order for things here as in the container
prep/clean phases and to make a future patch easier to review.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-17 10:53:32 +10:00
parent 0dbcfed117
commit 3e0a9e084d
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
.gitlab-ci.yml
View file

@ -428,13 +428,6 @@ alpine:latest@container-clean:
extends: .build@template
image: $FEDORA_CONTAINER_IMAGE
fedora:31@default-build:
stage: distro
extends: .fedora-build@template
variables:
FEDORA_VERSION: 31
needs: ['fedora:31@container-prep']
fedora:30@default-build:
stage: distro
extends: .fedora-build@template
@ -442,24 +435,12 @@ fedora:30@default-build:
FEDORA_VERSION: 30
needs: ['fedora:30@container-prep']
.centos-build@template:
fedora:31@default-build:
stage: distro
extends: .build@template
image: $CENTOS_CONTAINER_IMAGE
centos:7@default-build:
extends: .centos-build@template
extends: .fedora-build@template
variables:
CENTOS_VERSION: 7
MAKE_ARGS: '' # disable distcheck, requires doxygen
needs: ['centos:7@container-prep']
centos:8@default-build:
extends: .centos-build@template
variables:
CENTOS_VERSION: 8
MAKE_ARGS: '' # disable distcheck, requires doxygen
needs: ['centos:8@container-prep']
FEDORA_VERSION: 31
needs: ['fedora:31@container-prep']
.ubuntu@template:
stage: distro
@ -495,6 +476,25 @@ debian:sid@default-build:
DEBIAN_VERSION: sid
needs: ['debian:sid@container-prep']
.centos-build@template:
stage: distro
extends: .build@template
image: $CENTOS_CONTAINER_IMAGE
centos:7@default-build:
extends: .centos-build@template
variables:
CENTOS_VERSION: 7
MAKE_ARGS: '' # disable distcheck, requires doxygen
needs: ['centos:7@container-prep']
centos:8@default-build:
extends: .centos-build@template
variables:
CENTOS_VERSION: 8
MAKE_ARGS: '' # disable distcheck, requires doxygen
needs: ['centos:8@container-prep']
.arch@template:
stage: distro
extends: .build@template