fix folder issue

This commit is contained in:
Syping 2019-10-17 13:13:12 +02:00
parent 7bac6bd92c
commit b3f82aac99

View file

@ -9,16 +9,15 @@ LuaEngine Windows:
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
script: script:
- mkdir -p ${CI_PROJECT_DIR}/build - mkdir -p ${CI_PROJECT_DIR}/build
- mkdir -p ${CI_PROJECT_DIR}/assets
- cd ${CI_PROJECT_DIR}/build - cd ${CI_PROJECT_DIR}/build
- qmake CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ${CI_PROJECT_DIR}/luaengine.pro - qmake CONFIG+=WITH_LUAENGINECOM CONFIG+=WITH_LUAENGINERUN ${CI_PROJECT_DIR}/luaengine.pro
- make -j4 - make -j4
- cp -Rf src/luaenginecore/release/LuaEngine.dll ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaenginecore/release/LuaEngine.dll ${CI_PROJECT_DIR}/
- cp -Rf src/luaenginegui/release/LuaEngineGui.dll ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaenginegui/release/LuaEngineGui.dll ${CI_PROJECT_DIR}/
- cp -Rf src/luaengineio/release/LuaEngineIO.dll ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaengineio/release/LuaEngineIO.dll ${CI_PROJECT_DIR}/
- cp -Rf src/luaengineos/release/LuaEngineOS.dll ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaengineos/release/LuaEngineOS.dll ${CI_PROJECT_DIR}/
- cp -Rf src/luaengine/release/LuaEngine.exe ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaengine/release/LuaEngine.exe ${CI_PROJECT_DIR}/
- cp -Rf src/luaenginec/release/luaenginec.exe ${CI_PROJECT_DIR}/assets/ - cp -Rf src/luaenginec/release/luaenginec.exe ${CI_PROJECT_DIR}/
- cd ${CI_PROJECT_DIR}/assets - cd ${CI_PROJECT_DIR}/assets
artifacts: artifacts:
paths: paths:
@ -36,13 +35,12 @@ LuaEngine Debian:
- apt-get update -qq - apt-get update -qq
- apt-get install checkinstall gcc g++ make qtbase5-dev -qq - apt-get install checkinstall gcc g++ make qtbase5-dev -qq
- mkdir -p ${CI_PROJECT_DIR}/build - mkdir -p ${CI_PROJECT_DIR}/build
- mkdir -p ${CI_PROJECT_DIR}/assets
- cd ${CI_PROJECT_DIR}/build - 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 - /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 - make -j4
- echo "LuaEngine" > description-pak - 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=${CI_PROJECT_DIR}/assets - 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}
- cd ${CI_PROJECT_DIR}/assets - cd ${CI_PROJECT_DIR}
artifacts: artifacts:
paths: paths:
- "luaengine_*.deb" - "luaengine_*.deb"
@ -54,12 +52,11 @@ LuaEngine PE Windows:
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
script: script:
- mkdir -p ${CI_PROJECT_DIR}/build - mkdir -p ${CI_PROJECT_DIR}/build
- mkdir -p ${CI_PROJECT_DIR}/assets
- cd ${CI_PROJECT_DIR}/build - cd ${CI_PROJECT_DIR}/build
- qmake-static CONFIG+=WITH_LUAENGINEAPP ${CI_PROJECT_DIR}/luaengine.pro - qmake-static CONFIG+=WITH_LUAENGINEAPP ${CI_PROJECT_DIR}/luaengine.pro
- make -j4 - make -j4
- cp -Rf src/luaengineapp/release/LuaEngineApp.exe ${CI_PROJECT_DIR}/assets/windows.le - cp -Rf src/luaengineapp/release/LuaEngineApp.exe ${CI_PROJECT_DIR}/windows.le
- cd ${CI_PROJECT_DIR}/assets - cd ${CI_PROJECT_DIR}
artifacts: artifacts:
paths: paths:
- "windows.le" - "windows.le"