fixed yaml file

This commit is contained in:
Jan Koester 2020-03-09 08:33:35 +01:00 committed by Wim Taymans
parent fba9d8931d
commit 6c911993fb

View file

@ -4,17 +4,18 @@ stages:
variables: variables:
# Update this tag when you want to trigger a rebuild # Update this tag when you want to trigger a rebuild
FEDORA_TAG: '2019-11-21-01' FDO_DISTRIBUTION_TAG: '2019-11-21-01'
FEDORA_VERSION: '31' FDO_DISTRIBUTION_VERSION: '31'
FEDORA_IMAGE: "$CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$FEDORA_TAG" FDO_UPSTREAM_REPO: 'pipewire/pipewire'
FDO_FEDORA_IMAGE: "$CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
include: include:
- project: 'wayland/ci-templates' - project: 'wayland/ci-templates'
ref: master ref: master
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
build-container: container_build:
extends: .fedora@container-ifnot-exists extends: .fdo.container-ifnot-exists@fedora
stage: container stage: container
variables: variables:
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
@ -47,7 +48,7 @@ build-container:
build: build:
stage: build stage: build
image: $FEDORA_IMAGE image: $FDO_FEDORA_IMAGE
script: script:
- ./autogen.sh -Ddocs=true -Daudiomixer=true -Daudiotestsrc=true -Dtest=true -Dvideotestsrc=true -Dvolume=true - ./autogen.sh -Ddocs=true -Daudiomixer=true -Daudiotestsrc=true -Dtest=true -Dvideotestsrc=true -Dvolume=true
- make - make