diff options
| author | Jordan Petridis <jordan@centricular.com> | 2022-08-02 23:54:37 +0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-10-18 09:13:51 +0000 |
| commit | 1fda929c216e9cc32947cbdd45cd9428ccd42377 (patch) | |
| tree | 634e3587327fa3d987c3b9f2de98d7b3f652cd01 /ci/cerbero_setup.sh | |
| parent | a5ac638337d94fa7245241a6be8e9ef048349dae (diff) | |
ci: drop gst-inspect check for cross-win jobs
Recent versions of wine have began complaining about
not finding an x11 socker, and when provided with one
under xvfb/weston xwayland they are hanging.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/966>
Diffstat (limited to 'ci/cerbero_setup.sh')
| -rwxr-xr-x | ci/cerbero_setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index b13e85e9..09043e08 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -74,9 +74,9 @@ cerbero_package_and_check() { $CERBERO $CERBERO_ARGS package --offline ${CERBERO_PACKAGE_ARGS} -o "$(pwd_native)" gstreamer-1.0 # Run gst-inspect-1.0 for some basic checks. Can't do this for cross-(android|ios)-universal, of course. - if [[ $CONFIG != *universal* ]]; then - $CERBERO $CERBERO_ARGS run $CERBERO_RUN_WRAPPER gst-inspect-1.0$CERBERO_RUN_SUFFIX --version - $CERBERO $CERBERO_ARGS run $CERBERO_RUN_WRAPPER gst-inspect-1.0$CERBERO_RUN_SUFFIX + if [[ $CONFIG != *universal* ]] && [[ $CONFIG != *cross-win* ]]; then + $CERBERO $CERBERO_ARGS run gst-inspect-1.0$CERBERO_RUN_SUFFIX --version + $CERBERO $CERBERO_ARGS run gst-inspect-1.0$CERBERO_RUN_SUFFIX fi show_ccache_sum |