summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2022-05-18 12:26:14 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-10-18 09:13:51 +0000
commita5ac638337d94fa7245241a6be8e9ef048349dae (patch)
treee4016f1b9c53d633b279ae0d7ea797fd1414186c
parente93a44afe185423bca0dc18e5529519b13f98a91 (diff)
ci: Add CERBERO_RUN_* env vars to the windows cross deps jobs
These variables are used by cerbero_setup.sh that runs inspect after the build. They were missing and as such it was trying to launch the system version of gst-inspect. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/966>
-rw-r--r--.gitlab-ci.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc4e180b..f06d2318 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,6 +233,8 @@ cerbero deps cross-windows x86:
variables:
CONFIG: "cross-win32.cbc"
ARCH: "mingw_x86"
+ CERBERO_RUN_WRAPPER: "wine"
+ CERBERO_RUN_SUFFIX: ".exe"
build cerbero cross win32:
extends: '.cerbero mr'
@@ -247,6 +249,8 @@ cerbero deps cross-windows x86_64:
variables:
CONFIG: "cross-win64.cbc"
ARCH: "mingw_x86_64"
+ CERBERO_RUN_WRAPPER: "wine"
+ CERBERO_RUN_SUFFIX: ".exe"
build cerbero cross win64:
extends: '.cerbero mr'