From 03d817d2770d2238cc84042742755f81e0a6dd8c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 09:51:41 +0100 Subject: [PATCH] Force override macos deps in CI --- .ci/macos/Brewfile | 2 +- .gitlab-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile index 7e9687c7..e7a62374 100644 --- a/.ci/macos/Brewfile +++ b/.ci/macos/Brewfile @@ -1,12 +1,12 @@ tap "nlohmann/json" +brew "python3" brew "pkg-config" brew "clang-format" brew "cmake" brew "ninja" brew "openssl" brew "qt5" -brew "python3" brew "nlohmann_json" brew "gstreamer" brew "gst-plugins-base" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a6775db..4fa41d37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,8 @@ build-macos: tags: [macos] before_script: - brew update - - brew bundle --file=./.ci/macos/Brewfile + - brew reinstall --force python3 + - brew bundle --file=./.ci/macos/Brewfile --force --cleanup - pip3 install dmgbuild script: - export PATH=/usr/local/opt/qt/bin/:${PATH}