From ef41edba9b6945ad50c8a3509d6bf0ddbf31b065 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 9 Oct 2020 13:56:21 +0000
Subject: [PATCH] Install tools in before_install.osx.sh

---
 .gitlab-ci.yml           | 13 +------------
 CI/before_install.osx.sh |  5 ++++-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d335dfd91..8edf66569 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,9 +60,6 @@ MacOS:
   tags:
     - macos
   stage: build
-  before_script:
-    - command -v cmake >/dev/null 2>&1 || brew install cmake
-    - brew list qt || brew install qt
   script:
     - rm -fr build/*  #  remove anything in the build directory
     - CI/before_install.osx.sh
@@ -72,15 +69,7 @@ MacOS:
   artifacts:
     paths:
       - build/OpenMW-*.dmg
-      - "*.log"
-      - build/*.log
-      - build/*/*.log
-      - build/*/*/*.log
-      - build/*/*/*/*.log
-      - build/*/*/*/*/*.log
-      - build/*/*/*/*/*/*.log
-      - build/*/*/*/*/*/*/*.log
-      - build/*/*/*/*/*/*/*/*.log
+      - "build/**/*.log"
 
 variables: &engine-targets
   targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard"
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 5dae1f102..c3514e25b 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 
-brew install ccache
+# 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
+command -v cmake >/dev/null 2>&1 || brew install cmake
+command -v qmake >/dev/null 2>&1 || brew install qt
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null