diff options
| author | psi29a <psi29a@gmail.com> | 2021-05-02 13:54:20 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2021-05-02 13:56:22 +0000 |
| commit | 2f59d6a2a9378a3816007a0d1d50e988f60ad657 (patch) | |
| tree | 8cf1568eb1c73e67c4224a45b04e71a9c7199943 | |
| parent | 471ab431f51c3f19033aae94ef87bc998b300e88 (diff) | |
Merge branch 'bump-macos-dependencies' into 'master'cherry-pick-74612b12
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
| -rwxr-xr-x | CI/before_install.osx.sh | 8 |
1 files 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 |