diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-27 10:50:52 +0530 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-01-29 11:49:34 +0000 |
commit | 0a5e13894bbe813ae5422dc9de9119a71817d5e7 (patch) | |
tree | 0e284e5705ef1d2b2022c5568ddde9ab90517a48 /ci | |
parent | 35d00d4cf970dd9226f9e9a960f8cb84d395783a (diff) |
ci: Add cross-uwp-universal jobs, move to VS 2019
We have a new image that contains the necessary build tools for ARM,
ARM64, UWP and uses VS 2019
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/786>
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/cerbero_setup.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index 8f855376..79e70a63 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -95,10 +95,10 @@ cerbero_before_script() { echo "home_dir = \"$(pwd_native)/${CERBERO_HOME}\"" > localconf.cbc echo "local_sources = \"$(pwd_native)/${CERBERO_SOURCES}\"" >> localconf.cbc - if [[ $CONFIG == win??.cbc ]]; then - # Visual Studio 2017 build tools install path + if [[ $CONFIG == win??.cbc ]] || [[ $CONFIG =~ uwp ]] ; then + # Visual Studio 2019 build tools install path echo 'vs_install_path = "C:/BuildTools"' >> localconf.cbc - echo 'vs_install_version = "vs15"' >> localconf.cbc + echo 'vs_install_version = "vs16"' >> localconf.cbc fi echo "recipes_commits = {'gstreamer-1.0': 'ci/${CI_GSTREAMER_REF_NAME}'}" >> localconf.cbc echo "recipes_remotes = {'gstreamer-1.0': {'ci': '${CI_GSTREAMER_URL}'}}" >> localconf.cbc @@ -133,16 +133,24 @@ cerbero_script() { } cerbero_deps_script() { + # Build deps for all gstreamer recipes and any recipes that build gstreamer + # plugins (and hence compile against gstreamer) + local build_deps="gstreamer-1.0 gst-plugins-base-1.0 gst-plugins-good-1.0 + gst-plugins-bad-1.0 gst-plugins-ugly-1.0 gst-rtsp-server-1.0 + gst-devtools-1.0 gst-editing-services-1.0 libnice" + # Some deps that are only listed in the package files + local more_deps="glib-networking" + # UWP target doesn't support building ffmpeg yet + [[ $CONFIG =~ uwp ]] || build_deps="$build_deps gst-libav-1.0" + show_ccache_sum $CERBERO $CERBERO_ARGS show-config $CERBERO $CERBERO_ARGS fetch-bootstrap --jobs=4 $CERBERO $CERBERO_ARGS fetch-package --jobs=4 --deps gstreamer-1.0 $CERBERO $CERBERO_ARGS bootstrap --offline --system=no - $CERBERO $CERBERO_ARGS build-deps --offline \ - gstreamer-1.0 gst-plugins-base-1.0 gst-plugins-good-1.0 \ - gst-plugins-bad-1.0 gst-plugins-ugly-1.0 gst-rtsp-server-1.0 \ - gst-libav-1.0 gst-devtools-1.0 gst-editing-services-1.0 libnice + $CERBERO $CERBERO_ARGS build-deps --offline $build_deps + $CERBERO $CERBERO_ARGS build --offline $more_deps if [[ -n ${CERBERO_OVERRIDDEN_DIST_DIR} ]]; then mkdir -p "${CERBERO_HOME}/dist/${ARCH}" |