From dcba3a105860bff0f6ab484502c7cb351327d51b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 22 Jun 2018 15:13:09 +0000
Subject: [PATCH 02/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 78 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f5442ae4..3cfb429c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,42 +1,42 @@
-# use the official gcc image, based on debian
-# can use verions as well, like gcc:5.2
-# see https://hub.docker.com/_/gcc/
-image: gcc
-
-cache:
-  key: apt-cache
-  paths:
-  - apt-cache/
-
-before_script:
-  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-  - apt-get update -yq 
-  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev libsdl2-dev libqt4-dev libopenal-dev libopenscenegraph-3.4-dev libunshield-dev libtinyxml-dev
-# - apt-get install -y libmygui-dev libbullet-dev  # to be updated to latest below because stretch is too old
-  - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet-dev_2.87+dfsg-2_amd64.deb -o libbullet-dev_2.87+dfsg-2_amd64.deb
-  - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet2.87_2.87+dfsg-2_amd64.deb -o libbullet2.87_2.87+dfsg-2_amd64.deb
-  - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb -o libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb
-  - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb -o libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb
-  - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui-dev_3.2.2+dfsg-1_amd64.deb -o libmygui-dev_3.2.2+dfsg-1_amd64.deb
-  - dpkg --ignore-depends=libmygui.ogreplatform0debian1v5 -i *.deb 
-
-build:
-  stage: build
-  script: 
-    - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
-    - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
-    - make -j$cores_to_use
-    - DESTDIR=artifacts make install
-  artifacts:
-    paths:
-      - build/artifacts/
-  # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time
+linux-stable:
+  image: gcc
+    
   cache:
+    key: apt-cache
     paths:
-      - "*.o"
+    - apt-cache/
+    
+  before_script:
+    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+    - apt-get update -yq 
+    - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev libsdl2-dev libqt4-dev libopenal-dev libopenscenegraph-3.4-dev libunshield-dev libtinyxml-dev
+  # - apt-get install -y libmygui-dev libbullet-dev  # to be updated to latest below because stretch is too old
+    - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet-dev_2.87+dfsg-2_amd64.deb -o libbullet-dev_2.87+dfsg-2_amd64.deb
+    - curl http://ftp.us.debian.org/debian/pool/main/b/bullet/libbullet2.87_2.87+dfsg-2_amd64.deb -o libbullet2.87_2.87+dfsg-2_amd64.deb
+    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb -o libmygui.openglplatform0debian1v5_3.2.2+dfsg-1_amd64.deb
+    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb -o libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb
+    - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui-dev_3.2.2+dfsg-1_amd64.deb -o libmygui-dev_3.2.2+dfsg-1_amd64.deb
+    - dpkg --ignore-depends=libmygui.ogreplatform0debian1v5 -i *.deb 
+    
+  build:
+    stage: build
+    script: 
+      - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
+      - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
+      - make -j$cores_to_use
+      - DESTDIR=artifacts make install
+    artifacts:
+      paths:
+        - build/artifacts/
+darwin:
+  build:
+    stage: build
+    script: 
+      - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
+      - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
+      - make -j$cores_to_use
+      - DESTDIR=artifacts make install
+    artifacts:
+      paths:
+        - build/artifacts/
 
-# TODO: run tests using the binary built before
-#test:
-#  stage: test
-#  script:
-#    - ls

From 601b69b36c293a65eb4ca50494d5579656097a3b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 22 Jun 2018 15:14:09 +0000
Subject: [PATCH 03/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cfb429c1..7e156275f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+stages:
+  - build
+  
 linux-stable:
   image: gcc
     

From 88555c04635165114e3f6f251663eeb4f0d29b45 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 22 Jun 2018 15:20:38 +0000
Subject: [PATCH 04/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e156275f..80a6c4cdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,25 +21,23 @@ linux-stable:
     - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui-dev_3.2.2+dfsg-1_amd64.deb -o libmygui-dev_3.2.2+dfsg-1_amd64.deb
     - dpkg --ignore-depends=libmygui.ogreplatform0debian1v5 -i *.deb 
     
-  build:
-    stage: build
-    script: 
-      - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
-      - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
-      - make -j$cores_to_use
-      - DESTDIR=artifacts make install
-    artifacts:
-      paths:
-        - build/artifacts/
-darwin:
-  build:
-    stage: build
-    script: 
-      - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
-      - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
-      - make -j$cores_to_use
-      - DESTDIR=artifacts make install
-    artifacts:
-      paths:
-        - build/artifacts/
 
+  stage: build
+  script: 
+    - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
+    - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
+    - make -j$cores_to_use
+    - DESTDIR=artifacts make install
+  artifacts:
+    paths:
+      - build/artifacts/
+darwin:
+  stage: build
+  script: 
+    - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
+    - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
+    - make -j$cores_to_use
+    - DESTDIR=artifacts make install
+  artifacts:
+    paths:
+      - build/artifacts/
\ No newline at end of file

From 393ec9994475ed75178d1bc6ddd3e9a90dfb0f2d Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 22 Jun 2018 15:29:27 +0000
Subject: [PATCH 05/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80a6c4cdb..a87fcae0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,10 @@ stages:
   - build
   
 linux-stable:
+  tags:
+    - debian
+    - linux
+    
   image: gcc
     
   cache:
@@ -32,6 +36,9 @@ linux-stable:
     paths:
       - build/artifacts/
 darwin:
+  tags:
+    - xcode_7-2
+    - osx_10-11
   stage: build
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi

From c2826ca8786af19eedb0e521d1bc18f19816ad73 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Fri, 22 Jun 2018 16:41:20 +0000
Subject: [PATCH 06/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a87fcae0a..bf206df21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   
 linux-stable:
   tags:
-    - debian
+    - docker
     - linux
     
   image: gcc
@@ -37,8 +37,8 @@ linux-stable:
       - build/artifacts/
 darwin:
   tags:
-    - xcode_7-2
-    - osx_10-11
+    - macos
+    - macos_10_12
   stage: build
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi

From 40a9d8ac06ff51a7e0900f121df29d5d8af9c59c Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Jun 2018 07:19:05 +0000
Subject: [PATCH 07/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf206df21..807738c31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ linux-stable:
 darwin:
   tags:
     - macos
-    - macos_10_12
+    - xcode
   stage: build
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi

From 55de1c1a721edf3c14dd8ff836c336292585ec45 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Jun 2018 13:22:20 +0000
Subject: [PATCH 08/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 807738c31..3ae419c1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - build
   
-linux-stable:
+Debian:
   tags:
     - docker
     - linux
@@ -35,11 +35,12 @@ linux-stable:
   artifacts:
     paths:
       - build/artifacts/
-darwin:
+MacOS:
   tags:
     - macos
     - xcode
   stage: build
+  allow_failure: true
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
     - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../

From f1158e8129d947117acee2fac4f906c0faf37eda Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Jun 2018 13:50:58 +0000
Subject: [PATCH 09/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ae419c1d..690ef8ef3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,10 +41,10 @@ MacOS:
     - xcode
   stage: build
   allow_failure: true
-  script: 
-    - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
-    - mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../
-    - make -j$cores_to_use
+  script:
+    - CI/before_install.osx.sh
+    - CI/before_script.osx.sh
+    - make -j2
     - DESTDIR=artifacts make install
   artifacts:
     paths:

From 87f367ec117db627c8fc6d2f72861151a356ff96 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 24 Jun 2018 17:52:57 +0000
Subject: [PATCH 10/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 690ef8ef3..fc00ba728 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,14 +5,11 @@ Debian:
   tags:
     - docker
     - linux
-    
   image: gcc
-    
   cache:
     key: apt-cache
     paths:
     - apt-cache/
-    
   before_script:
     - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
     - apt-get update -yq 
@@ -24,8 +21,6 @@ Debian:
     - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb -o libmyguiengine3debian1v5_3.2.2+dfsg-1_amd64.deb
     - curl http://ftp.us.debian.org/debian/pool/main/m/mygui/libmygui-dev_3.2.2+dfsg-1_amd64.deb -o libmygui-dev_3.2.2+dfsg-1_amd64.deb
     - dpkg --ignore-depends=libmygui.ogreplatform0debian1v5 -i *.deb 
-    
-
   stage: build
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi
@@ -42,6 +37,7 @@ MacOS:
   stage: build
   allow_failure: true
   script:
+    - macos_qt_formula=qt
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - make -j2

From d008cd0c46c1ff8e78164aafa0ae883862897b17 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sun, 24 Jun 2018 21:26:53 +0000
Subject: [PATCH 11/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc00ba728..83a6ab63f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,8 @@ MacOS:
   stage: build
   allow_failure: true
   script:
-    - macos_qt_formula=qt
-    - CI/before_install.osx.sh
+    #- macos_qt_formula=qt
+    #- CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - make -j2
     - DESTDIR=artifacts make install

From ae4cb0c3ee279ce05aaeba6d5c9a827d0c02a0b3 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 13:50:45 +0000
Subject: [PATCH 12/21] no need for macos_qt_formula since on osx there is no
 more qt4, just qt5

---
 .travis.yml              | 1 -
 CI/before_install.osx.sh | 2 +-
 CI/before_script.osx.sh  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d2e6a795..c6facef2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ env:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
    #   via the "travis encrypt" command using the project repo's public key
    - secure: "jybGzAdUbqt9vWR/GEnRd96BgAi/7Zd1+2HK68j/i/8+/1YH2XxLOy4Jv/DUBhBlJIkxs/Xv8dRcUlFOclZDHX1d/9Qnsqd3oUVkD7k1y7cTOWy9TBQaE/v/kZo3LpzA3xPwwthrb0BvqIbOfIELi5fS5s8ba85WFRg3AX70wWE="
-   - macos_qt_formula=qt
 addons:
   apt:
     sources:
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 47f4021cf..48e2ef6ba 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -4,7 +4,7 @@ brew update
 
 brew outdated cmake || brew upgrade cmake
 brew outdated pkgconfig || brew upgrade pkgconfig
-brew install $macos_qt_formula
+brew install qt
 
 curl https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip
 unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 2d1cf8729..8ee01b652 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -4,7 +4,7 @@ export CXX=clang++
 export CC=clang
 
 DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
-QT_PATH=`brew --prefix $macos_qt_formula`
+QT_PATH=`brew --prefix qt`
 mkdir build
 cd build
 

From 308d78e3dafab71ee8ba173e8ed7fb35a7a41e2f Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 13:54:37 +0000
Subject: [PATCH 13/21] only download via curl if file on server is different
 than what is currently cached on VM.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83a6ab63f..97070136f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ MacOS:
   allow_failure: true
   script:
     #- macos_qt_formula=qt
-    #- CI/before_install.osx.sh
+    - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - make -j2
     - DESTDIR=artifacts make install
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 48e2ef6ba..c4793d1cf 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -6,5 +6,5 @@ brew outdated cmake || brew upgrade cmake
 brew outdated pkgconfig || brew upgrade pkgconfig
 brew install qt
 
-curl https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip
+curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip
 unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From 9e2c6d9fe1cb142f9e72f1f2b9a800d44e98f8ce Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 13:57:13 +0000
Subject: [PATCH 14/21] actually step into the build directory and build!

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97070136f..8d3ebccbe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ MacOS:
     #- macos_qt_formula=qt
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
-    - make -j2
+    - cd build; make -j2
     - DESTDIR=artifacts make install
   artifacts:
     paths:

From e068ee353372676279cf65708e861d5733007f44 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 14:01:10 +0000
Subject: [PATCH 15/21] tell unzip to overwrite all files

---
 CI/before_install.osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index c4793d1cf..2ab996b10 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -7,4 +7,4 @@ brew outdated pkgconfig || brew upgrade pkgconfig
 brew install qt
 
 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-100d2e0.zip -o ~/openmw-deps.zip
-unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
+unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

From 06eb9539bd219a41664e90bd7d5c95103eed0c04 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 14:51:55 +0000
Subject: [PATCH 16/21] Let make install do it's thing, it's more reasonable on
 macos and let's only archive that.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d3ebccbe..9ca719efe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ MacOS:
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j2
-    - DESTDIR=artifacts make install
+    - make install
   artifacts:
     paths:
-      - build/artifacts/
\ No newline at end of file
+      - /usr/local/OpenMW.app
\ No newline at end of file

From c1aee49b763f51657ae742967f42ae13fddf323b Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 15:09:51 +0000
Subject: [PATCH 17/21] clean up after our previous build.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ca719efe..986e2d2aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,11 +37,11 @@ MacOS:
   stage: build
   allow_failure: true
   script:
-    #- macos_qt_formula=qt
+    - sudo rm -fr /usr/local/Openmw.app  # clean up after previous build
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j2
-    - make install
+    - sudo make install
   artifacts:
     paths:
       - /usr/local/OpenMW.app
\ No newline at end of file

From dd60b8f1791edb309584378e63a71238902aef72 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 15:18:18 +0000
Subject: [PATCH 18/21] only delete files inside OpenMW.app dir

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 986e2d2aa..6ffe17a70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,11 +37,11 @@ MacOS:
   stage: build
   allow_failure: true
   script:
-    - sudo rm -fr /usr/local/Openmw.app  # clean up after previous build
+    - rm -fr /usr/local/Openmw.app/*  # clean up after previous build
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j2
-    - sudo make install
+    - make install
   artifacts:
     paths:
       - /usr/local/OpenMW.app
\ No newline at end of file

From cfcd9c3fc63e384a919add2c136294fe63577c90 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 15:36:53 +0000
Subject: [PATCH 19/21] What happens when we don't make install?

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ffe17a70..14348f5c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ MacOS:
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j2
-    - make install
+    # - make install
   artifacts:
     paths:
       - /usr/local/OpenMW.app
\ No newline at end of file

From 9e7731259dc10e7e5d477c0950cd61698fa5847a Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 15:40:06 +0000
Subject: [PATCH 20/21] what if we try make -j2 package ?

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14348f5c2..1d7502bb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ MacOS:
     - rm -fr /usr/local/Openmw.app/*  # clean up after previous build
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
-    - cd build; make -j2
+    - cd build; make -j2 package
     # - make install
   artifacts:
     paths:

From 4d6ca2c387c1e41ee8f226f33fe2eabfb2b03706 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 26 Jun 2018 17:45:20 +0000
Subject: [PATCH 21/21] preserve dmg artifact

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d7502bb8..d815c7d77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,11 +37,10 @@ MacOS:
   stage: build
   allow_failure: true
   script:
-    - rm -fr /usr/local/Openmw.app/*  # clean up after previous build
+    - rm -fr build/*  #  remove anything in the build directory
     - CI/before_install.osx.sh
     - CI/before_script.osx.sh
     - cd build; make -j2 package
-    # - make install
   artifacts:
     paths:
-      - /usr/local/OpenMW.app
\ No newline at end of file
+      - build/OpenMW-*.dmg
\ No newline at end of file