From eb62474b0cb512cdf54bfd08f75a1b8ba05efe27 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 17 Oct 2019 13:03:33 +0200
Subject: [PATCH] improve GitLab CI build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86072d3..217f050 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,17 +8,17 @@ LuaEngine Windows:
   variables:
     QT_SELECT: "qt5-x86_64-w64-mingw32"
   script:
-    - mkdir -p build
-    - cd build
-    - qmake CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ../luaengine.pro
+    - mkdir -p ${CI_PROJECT_DIR}/build
+    - mkdir -p ${CI_PROJECT_DIR}/assets
+    - cd ${CI_PROJECT_DIR}/build
+    - qmake CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ${CI_PROJECT_DIR}/luaengine.pro
     - make -j4
-    - cp -Rf src/luaenginecore/release/LuaEngine.dll ../
-    - cp -Rf src/luaenginegui/release/LuaEngineGui.dll ../
-    - cp -Rf src/luaengineio/release/LuaEngineIO.dll ../
-    - cp -Rf src/luaengineos/release/LuaEngineOS.dll ../
-    - cp -Rf src/luaengine/release/LuaEngine.exe ../
-    - cp -Rf src/luaenginec/release/luaenginec.exe ../
-    - cd ..
+    - cp -Rf src/luaenginecore/release/LuaEngine.dll ${CI_PROJECT_DIR}/assets/
+    - cp -Rf src/luaenginegui/release/LuaEngineGui.dll ${CI_PROJECT_DIR}/assets/
+    - cp -Rf src/luaengineio/release/LuaEngineIO.dll ${CI_PROJECT_DIR}/assets/
+    - cp -Rf src/luaengineos/release/LuaEngineOS.dll ${CI_PROJECT_DIR}/assets/
+    - cp -Rf src/luaengine/release/LuaEngine.exe ${CI_PROJECT_DIR}/assets/
+    - cp -Rf src/luaenginec/release/luaenginec.exe ${CI_PROJECT_DIR}/assets/
   artifacts:
     paths:
       - "LuaEngine.dll"
@@ -34,13 +34,13 @@ LuaEngine Debian:
   script:
     - apt-get update -qq
     - apt-get install checkinstall gcc g++ make qtbase5-dev -qq
-    - mkdir -p build
-    - cd build
-    - /usr/lib/x86_64-linux-gnu/qt5/bin/qmake LUAENGINE_PREFIX=/usr LUAENGINE_LIBDIR=/usr/lib/x86_64-linux-gnu CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ../luaengine.pro
+    - mkdir -p ${CI_PROJECT_DIR}/build
+    - mkdir -p ${CI_PROJECT_DIR}/assets
+    - cd ${CI_PROJECT_DIR}/build
+    - /usr/lib/x86_64-linux-gnu/qt5/bin/qmake LUAENGINE_PREFIX=/usr LUAENGINE_LIBDIR=/usr/lib/x86_64-linux-gnu CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ${CI_PROJECT_DIR}/luaengine.pro
     - make -j4
     - echo "LuaEngine" > description-pak
-    - checkinstall --default --fstrans=no --install=no --nodoc --pkgname=luaengine "--pkglicense=Apache 2.0" --pkggroup=utility --pkgrelease=deb9u${CI_PIPELINE_IID} "--maintainer=Syping GitLab \<gitlab@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5widgets5,qttranslations5-l10n --provides=libluaengine,libluaenginegui,libluaengineio,libluaengineos --conflicts=libluaengine,libluaenginegui,libluaengineio,libluaengineos --pakdir=..
-    - cd ..
+    - checkinstall --default --fstrans=no --install=no --nodoc --pkgname=luaengine "--pkglicense=Apache 2.0" --pkggroup=utility --pkgrelease=deb9u${CI_PIPELINE_IID} "--maintainer=Syping GitLab \<gitlab@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5widgets5,qttranslations5-l10n --provides=libluaengine,libluaenginegui,libluaengineio,libluaengineos --conflicts=libluaengine,libluaenginegui,libluaengineio,libluaengineos --pakdir=${CI_PROJECT_DIR}/assets/
   artifacts:
     paths:
       - "luaengine_*.deb"
@@ -51,12 +51,12 @@ LuaEngine PE Windows:
   variables:
     QT_SELECT: "qt5-x86_64-w64-mingw32"
   script:
-    - mkdir -p build
-    - cd build
-    - qmake-static CONFIG+=WITH_LUAENGINEAPP ../luaengine.pro
+    - mkdir -p ${CI_PROJECT_DIR}/build
+    - mkdir -p ${CI_PROJECT_DIR}/assets
+    - cd ${CI_PROJECT_DIR}/build
+    - qmake-static CONFIG+=WITH_LUAENGINEAPP ${CI_PROJECT_DIR}/luaengine.pro
     - make -j4
-    - cp -Rf src/luaengineapp/release/LuaEngineApp.exe ../windows.le
-    - cd ..
+    - cp -Rf src/luaengineapp/release/LuaEngineApp.exe ${CI_PROJECT_DIR}/assets/windows.le
   artifacts:
     paths:
       - "windows.le"