diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-10-15 14:59:34 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-10-15 14:59:34 +0300 |
| commit | 3b56247afd8b76bce7e13886a24b4d10536c74b0 (patch) | |
| tree | fcd7028d65aa1fbabd11254a83b84355d90efd36 /scripts/ci | |
| parent | 806f75fe4f1f99ed1b04cb8a6e796a60bfd93872 (diff) | |
[ci] Only install android-specific brew packages when building for android
Diffstat (limited to 'scripts/ci')
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index e7e17068250..2f0abcac4f7 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -113,8 +113,11 @@ def archive (product, configuration, platform, chrootname = "", chrootadditional // build the Archive timeout (time: 300, unit: 'MINUTES') { if (platform == "Darwin") { - def brewpackages = "autoconf automake ccache cmake coreutils gdk-pixbuf gettext glib gnu-sed gnu-tar intltool ios-deploy jpeg libffi libidn2 libpng libtiff libtool libunistring ninja openssl p7zip pcre pkg-config scons wget xz mingw-w64 make xamarin/xamarin-android-windeps/mingw-zlib" - sh "brew tap xamarin/xamarin-android-windeps" + def brewpackages = "autoconf automake ccache cmake coreutils gdk-pixbuf gettext glib gnu-sed gnu-tar intltool ios-deploy jpeg libffi libidn2 libpng libtiff libtool libunistring ninja openssl p7zip pcre pkg-config scons wget xz mingw-w64 make" + if (product == "android") { + brewpackages = "${brewpackages} xamarin/xamarin-android-windeps/mingw-zlib" + sh "brew tap xamarin/xamarin-android-windeps" + } sh "brew install ${brewpackages} || brew upgrade ${brewpackages}" sh "CI_TAGS=sdks-${product},no-tests,${configuration},${xcodeVersion} scripts/ci/run-jenkins.sh" } else if (platform == "Linux") { |