From 5a25a1cf09a236fccc38b2b7d1895b6b3a0d2dce Mon Sep 17 00:00:00 2001 From: Syping Date: Wed, 1 Apr 2020 05:54:55 +0200 Subject: [PATCH] update .gitlab-ci.yml --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92bc908..58ae531 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,10 @@ stages: - - build + - runtime + - portable - deploy LuaEngine Windows: - stage: build + stage: runtime image: syping/qt5-shared-mingw-openssl:5.12.7 variables: QT_SELECT: "qt5-x86_64-w64-mingw32" @@ -29,7 +30,7 @@ LuaEngine Windows: - "LuaEngineOS.dll" LuaEngine Debian amd64: - stage: build + stage: runtime image: syping/debian9-qt5:amd64 script: - mkdir -p ${CI_PROJECT_DIR}/build @@ -43,15 +44,15 @@ LuaEngine Debian amd64: paths: - "luaengine_*.deb" -LuaEngine Debian arm64: - stage: build - image: syping/debian9-qt5:arm64v8 +LuaEngine Debian armhf: + stage: runtime + image: syping/debian9-qt5:arm32v7 tags: - - arm64v8 + - armhf script: - mkdir -p ${CI_PROJECT_DIR}/build - cd ${CI_PROJECT_DIR}/build - - /usr/lib/aarch64-linux-gnu/qt5/bin/qmake LUAENGINE_PREFIX=/usr LUAENGINE_LIBDIR=/usr/lib/aarch64-linux-gnu CONFIG+=WITH_LUAENGINE_COMPILER CONFIG+=WITH_LUAENGINE_RUNTIME ${CI_PROJECT_DIR}/luaengine.pro + - /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake LUAENGINE_PREFIX=/usr LUAENGINE_LIBDIR=/usr/lib/arm-linux-gnueabihf CONFIG+=WITH_LUAENGINE_COMPILER CONFIG+=WITH_LUAENGINE_RUNTIME ${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 \" --requires=libqt5core5a,libqt5gui5,libqt5widgets5,qttranslations5-l10n --provides=libluaengine,libluaenginegui,libluaengineio,libluaengineos --conflicts=libluaengine,libluaenginegui,libluaengineio,libluaengineos --pakdir=${CI_PROJECT_DIR} @@ -61,7 +62,7 @@ LuaEngine Debian arm64: - "luaengine_*.deb" LuaEngine PE Windows: - stage: build + stage: portable image: syping/qt5-static-mingw-openssl:5.12.7 variables: QT_SELECT: "qt5-x86_64-w64-mingw32"