Syping/luaengineapp
1
0
Fork 0
mirror of https://gitlab.com/Syping/luaengineapp.git synced 2024-12-22 11:55:29 +01:00
Code Issues Projects Releases Wiki Activity

gitlab build in stages

Browse source
This commit is contained in:
Syping 2019-10-07 02:17:33 +02:00
parent 769d291f35
commit 527f3e4960
3 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
.gitlab-ci.yml
View file

@ -1,21 +1,50 @@
stages: stages:
- build - build
- deploy
Windows Portable: luaengine:
stage: build stage: build
image: syping/qt5-static-mingw-openssl:5.12.4 image: syping/qt5-shared-mingw-openssl:5.12.5
variables: variables:
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
script: script:
- mkdir -p build - mkdir -p build
- cd build - cd build
- qmake-static CONFIG+=WITH_LUAENGINEAPP CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro - qmake-static CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro
- make -j4 - make ${nproc --all}
- cp -Rf src/luaengineapp/release/luaengineapp.exe ../ - cp -Rf src/luaengineapp/release/luaengine.exe ../
- cp -Rf src/luaenginerun/release/luaengine.exe ../
- cd .. - cd ..
artifacts:
paths:
- "luaengine.exe"
luaengineapp:
stage: build
image: syping/qt5-static-mingw-openssl:5.12.5
variables:
QT_SELECT: "qt5-x86_64-w64-mingw32"
script:
- mkdir -p build
- cd build
- qmake-static CONFIG+=WITH_LUAENGINEAPP ../luaengineapp.pro
- make ${nproc --all}
- cp -Rf src/luaengineapp/release/luaengineapp.exe ../
- cd ..
artifacts:
paths:
- "luaengineapp.exe"
luaengine:
stage: deploy
image: syping/qt5-shared-mingw-openssl:5.12.5
script:
- apt-get update -qq
- apt-get install nsis -qq
- nsis
artifacts: artifacts:
name: "luaengine-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}" name: "luaengine-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}"
paths: paths:
- "luaengine.exe" - "luaengine.exe"
- "luaengineapp.exe" dependencies:
- luaengine
- luaengineapp

2
src/luaengineio/luaengine/LuaEngineIO.cpp
View file

@ -18,8 +18,8 @@
#include "LuaEngineIO.h" #include "LuaEngineIO.h"
#include <QDirIterator> #include <QDirIterator>
#include <QTextStream> #include <QTextStream>
#include <QObject>
#include <QString> #include <QString>
#include <QObject>
#include <QFile> #include <QFile>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "windows.h" #include "windows.h"

10
src/luaengineos/luaengine/LuaEngineOS.cpp
View file

@ -16,18 +16,10 @@
*****************************************************************************/ *****************************************************************************/
#include "LuaEngineOS.h" #include "LuaEngineOS.h"
#include <QDirIterator>
#include <QTextStream> #include <QTextStream>
#include <QProcess> #include <QProcess>
#include <QObject>
#include <QString> #include <QString>
#include <QFile> #include <QObject>
#ifdef Q_OS_WIN
#include "windows.h"
#include <iostream>
#else
#include "unistd.h"
#endif
LuaEngineOS::LuaEngineOS(QObject *parent, bool loadBaseLibraries) : LuaEngine(parent, loadBaseLibraries) LuaEngineOS::LuaEngineOS(QObject *parent, bool loadBaseLibraries) : LuaEngine(parent, loadBaseLibraries)
{ {