diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-09-22 10:36:10 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-09-22 17:44:00 +0530 |
| commit | e5dc2ad97349fb311bc42c3b643f13295e52cdb7 (patch) | |
| tree | ac3007cda30741bffb82868e62603a6588aa56ac | |
| parent | 8b9e1387c35b170d8758bb43cd44a38ff11b8630 (diff) | |
ci: Build pkg-config as part of deps build on macOS and Windows
Otherwise it gets built every single time in merge requests that
consume cerbero deps cache. Should save a few min on macOS and Windows
jobs.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/933>
| -rwxr-xr-x | ci/cerbero_setup.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index 2d020e4c..2e0d63c3 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -139,10 +139,21 @@ cerbero_deps_script() { 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 + # Deps that don't get picked up automatically because 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" + if ! [[ $CONFIG =~ uwp ]]; then + build_deps="$build_deps gst-libav-1.0" + # Deps that don't get picked up automatically because they are + # a runtime dep + # XXX: This is two separate comparisons because older bash (as on + # Cerbero's MSYS) requires `|` to be escaped, but newer bash + # (everywhere else) requires it to not be escaped. + if [[ $ARCH =~ darwin ]] || [[ $ARCH =~ msvc\|mingw ]]; then + more_deps="$more_deps pkg-config" + fi + fi show_ccache_sum |