From aca5d2fc122a72ced609696127f2cc65f61fe5e6 Mon Sep 17 00:00:00 2001 From: psi29a Date: Sun, 2 May 2021 13:54:20 +0000 Subject: [PATCH] Merge branch 'bump-macos-dependencies' into 'master' Use prebuilt macOS dependencies with fixed SDL and OSG 3.6 Closes #5939 See merge request OpenMW/openmw!804 (cherry picked from commit 74612b1286330b1e34a9c37528502770496e5bba) 9aaca972 Use prebuilt macOS dependencies with fixed SDL and OSG 3.6 --- CI/before_install.osx.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index c03341b863..51bcb9a59d 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,9 +1,9 @@ #!/bin/sh -ex # workaround python issue on travis -[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true -[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true -[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true +[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true +[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true +[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true # Some of these tools can come from places other than brew, so check before installing command -v ccache >/dev/null 2>&1 || brew install ccache @@ -15,5 +15,5 @@ ccache --version cmake --version qmake --version -curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6e.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null