Install tools in before_install.osx.sh

.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"

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