mirror of
https://gitlab.com/Syping/luaengineapp.git
synced 2024-11-04 21:16:56 +01:00
gitlab build in stages
This commit is contained in:
parent
769d291f35
commit
527f3e4960
3 changed files with 38 additions and 17 deletions
|
@ -1,21 +1,50 @@
|
|||
stages:
|
||||
- build
|
||||
- deploy
|
||||
|
||||
Windows Portable:
|
||||
luaengine:
|
||||
stage: build
|
||||
image: syping/qt5-static-mingw-openssl:5.12.4
|
||||
image: syping/qt5-shared-mingw-openssl:5.12.5
|
||||
variables:
|
||||
QT_SELECT: "qt5-x86_64-w64-mingw32"
|
||||
script:
|
||||
- mkdir -p build
|
||||
- cd build
|
||||
- qmake-static CONFIG+=WITH_LUAENGINEAPP CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro
|
||||
- make -j4
|
||||
- cp -Rf src/luaengineapp/release/luaengineapp.exe ../
|
||||
- cp -Rf src/luaenginerun/release/luaengine.exe ../
|
||||
- qmake-static CONFIG+=WITH_LUAENGINERUN ../luaengineapp.pro
|
||||
- make ${nproc --all}
|
||||
- cp -Rf src/luaengineapp/release/luaengine.exe ../
|
||||
- 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:
|
||||
name: "luaengine-$CI_COMMIT_REF_NAME-${CI_COMMIT_SHA:0:8}"
|
||||
paths:
|
||||
- "luaengine.exe"
|
||||
- "luaengineapp.exe"
|
||||
dependencies:
|
||||
- luaengine
|
||||
- luaengineapp
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
#include "LuaEngineIO.h"
|
||||
#include <QDirIterator>
|
||||
#include <QTextStream>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QObject>
|
||||
#include <QFile>
|
||||
#ifdef Q_OS_WIN
|
||||
#include "windows.h"
|
||||
|
|
|
@ -16,18 +16,10 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "LuaEngineOS.h"
|
||||
#include <QDirIterator>
|
||||
#include <QTextStream>
|
||||
#include <QProcess>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QFile>
|
||||
#ifdef Q_OS_WIN
|
||||
#include "windows.h"
|
||||
#include <iostream>
|
||||
#else
|
||||
#include "unistd.h"
|
||||
#endif
|
||||
#include <QObject>
|
||||
|
||||
LuaEngineOS::LuaEngineOS(QObject *parent, bool loadBaseLibraries) : LuaEngine(parent, loadBaseLibraries)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue