From 601ccaf414b15d25796b26eeeba663815162df88 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Wed, 16 Oct 2019 19:13:35 +0200 Subject: [PATCH 1/2] Fix OSX build on azure --- ci/azure-pipelines-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml index 5331806440d7..a9c8019f7221 100644 --- a/ci/azure-pipelines-steps.yml +++ b/ci/azure-pipelines-steps.yml @@ -28,7 +28,7 @@ steps: - ${{ if eq(parameters.installer, 'brew') }}: - script: | - brew install pkg-config ffmpeg imagemagick mplayer ccache + brew install pkg-config ffmpeg imagemagick mplayer ccache xquartz displayName: 'Install dependencies with brew' - ${{ if eq(parameters.installer, 'apt') }}: From 6488d90ae769b1104f70f158c7c2e66e1ad25fb2 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 16 Oct 2019 17:25:37 -0400 Subject: [PATCH 2/2] CI: try different way to install xquartz --- ci/azure-pipelines-steps.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml index a9c8019f7221..3060304fe7ca 100644 --- a/ci/azure-pipelines-steps.yml +++ b/ci/azure-pipelines-steps.yml @@ -28,7 +28,8 @@ steps: - ${{ if eq(parameters.installer, 'brew') }}: - script: | - brew install pkg-config ffmpeg imagemagick mplayer ccache xquartz + brew cask install xquartz + brew install pkg-config ffmpeg imagemagick mplayer ccache displayName: 'Install dependencies with brew' - ${{ if eq(parameters.installer, 'apt') }}: