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

gitlab CI: move the container-clean git strategy to the parent section

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-26 13:07:09 +10:00
parent 2a51c15683
commit c12af0864c
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -411,13 +411,14 @@ alpine:latest@container-prep:
allow_failure: true allow_failure: true
only: only:
- schedules - schedules
variables:
GIT_STRATEGY: none
### fedora 30 ### fedora 30
fedora:30@container-clean: fedora:30@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
FEDORA_VERSION: '30' FEDORA_VERSION: '30'
CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE
@ -426,7 +427,6 @@ fedora:30@container-clean:
fedora:31@container-clean: fedora:31@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
FEDORA_VERSION: '31' FEDORA_VERSION: '31'
CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE
@ -435,7 +435,6 @@ fedora:31@container-clean:
ubuntu:19.10@container-clean: ubuntu:19.10@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
UBUNTU_VERSION: '19.10' UBUNTU_VERSION: '19.10'
CURRENT_CONTAINER_IMAGE: $UBUNTU_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $UBUNTU_CONTAINER_IMAGE
@ -444,7 +443,6 @@ ubuntu:19.10@container-clean:
ubuntu:19.04@container-clean: ubuntu:19.04@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
UBUNTU_VERSION: '19.04' UBUNTU_VERSION: '19.04'
CURRENT_CONTAINER_IMAGE: $UBUNTU_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $UBUNTU_CONTAINER_IMAGE
@ -453,7 +451,6 @@ ubuntu:19.04@container-clean:
debian:stable@container-clean: debian:stable@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
DEBIAN_VERSION: 'stable' DEBIAN_VERSION: 'stable'
CURRENT_CONTAINER_IMAGE: $DEBIAN_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $DEBIAN_CONTAINER_IMAGE
@ -462,7 +459,6 @@ debian:stable@container-clean:
debian:sid@container-clean: debian:sid@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
DEBIAN_VERSION: 'sid' DEBIAN_VERSION: 'sid'
CURRENT_CONTAINER_IMAGE: $DEBIAN_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $DEBIAN_CONTAINER_IMAGE
@ -471,7 +467,6 @@ debian:sid@container-clean:
centos:7@container-clean: centos:7@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
CENTOS_VERSION: '7' CENTOS_VERSION: '7'
CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE
@ -480,7 +475,6 @@ centos:7@container-clean:
centos:8@container-clean: centos:8@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
CENTOS_VERSION: '8' CENTOS_VERSION: '8'
CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $CENTOS_CONTAINER_IMAGE
@ -489,7 +483,6 @@ centos:8@container-clean:
arch:rolling@container-clean: arch:rolling@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
ARCH_VERSION: 'rolling' ARCH_VERSION: 'rolling'
CURRENT_CONTAINER_IMAGE: $ARCH_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $ARCH_CONTAINER_IMAGE
@ -498,7 +491,6 @@ arch:rolling@container-clean:
alpine:latest@container-clean: alpine:latest@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
ALPINE_VERSION: 'latest' ALPINE_VERSION: 'latest'
CURRENT_CONTAINER_IMAGE: $ALPINE_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: $ALPINE_CONTAINER_IMAGE

3
.gitlab-ci/gitlab-ci.tmpl
View file

@ -271,6 +271,8 @@ fedora:31@qemu-prep:
allow_failure: true allow_failure: true
only: only:
- schedules - schedules
variables:
GIT_STRATEGY: none
{% for distro in distributions %} {% for distro in distributions %}
@ -278,7 +280,6 @@ fedora:31@qemu-prep:
{{ distro.name }}:{{ distro.version }}@container-clean: {{ distro.name }}:{{ distro.version }}@container-clean:
extends: .container-clean extends: .container-clean
variables: variables:
GIT_STRATEGY: none
{{ distro.name.upper() }}_VERSION: '{{ distro.version }}' {{ distro.name.upper() }}_VERSION: '{{ distro.version }}'
CURRENT_CONTAINER_IMAGE: ${{ distro.name.upper() }}_CONTAINER_IMAGE CURRENT_CONTAINER_IMAGE: ${{ distro.name.upper() }}_CONTAINER_IMAGE