mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gitlab: Re-add ARCH parameter to cerbero deps jobs

Browse source 
This is required and was removed without proper testing.
This commit is contained in:
Nicolas Dufresne 2019-01-08 13:22:02 -05:00
parent 5a55d5103d
commit 2396e18358
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gitlab/ci_template.yml
View file

@ -263,6 +263,7 @@ check fedora:
# #
# Parameters: # Parameters:
# CONFIG: The name of the configuration file to use # CONFIG: The name of the configuration file to use
# ARCH: The cerbero <os>_<cpu> (used in cache key)
# #
# Produce an artifact with the dist/ and .cache along # Produce an artifact with the dist/ and .cache along
# with the associated build-tools. # with the associated build-tools.
@ -280,7 +281,8 @@ check fedora:
gst-libav-1.0 gst-validate gst-editing-services-1.0 libnice gst-libav-1.0 gst-validate gst-editing-services-1.0 libnice
- $CERBERO fetch-cache --skip-fetch --job-id=${CI_JOB_ID} - $CERBERO fetch-cache --skip-fetch --job-id=${CI_JOB_ID}
- tar -C ${CERBERO_HOME} -czf $CERBERO_DEPS - tar -C ${CERBERO_HOME} -czf $CERBERO_DEPS
build-tools/ dist/ *.cache build-tools build-tools.cache
dist/${ARCH} ${ARCH}.cache
- ccache -s - ccache -s
only: only:
variables: variables:
@ -307,6 +309,7 @@ check fedora:
extends: '.cerbero deps' extends: '.cerbero deps'
variables: variables:
CONFIG: "linux.config" CONFIG: "linux.config"
ARCH: "linux_x86_64"
# This indirection allow overriding the image without passing again CONFIG # This indirection allow overriding the image without passing again CONFIG
build cerbero fedora x86_64: build cerbero fedora x86_64:
@ -324,6 +327,7 @@ build cerbero fedora x86_64:
extends: '.cerbero deps' extends: '.cerbero deps'
variables: variables:
CONFIG: "cross-win32.cbc" CONFIG: "cross-win32.cbc"
ARCH: "windows_x86"
build cerbero cross win32: build cerbero cross win32:
extends: '.build cerbero cross win32' extends: '.build cerbero cross win32'
@ -337,6 +341,7 @@ build cerbero cross win32:
extends: '.cerbero deps' extends: '.cerbero deps'
variables: variables:
CONFIG: "cross-win64.cbc" CONFIG: "cross-win64.cbc"
ARCH: "windows_x86_64"
build cerbero cross win64: build cerbero cross win64:
extends: '.build cerbero cross win64' extends: '.build cerbero cross win64'