build in one job
This commit is contained in:
parent
3d29ab4b17
commit
9bfddef920
@ -9,7 +9,7 @@ image: conanio/gcc9:latest
|
|||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- $HOME/.conan/data
|
- ../.conan/data
|
||||||
|
|
||||||
conan:
|
conan:
|
||||||
stage: conan
|
stage: conan
|
||||||
@ -19,20 +19,10 @@ conan:
|
|||||||
- conan user lukas-heiligenbrunner -r bintray -p $CONAN_KEY
|
- conan user lukas-heiligenbrunner -r bintray -p $CONAN_KEY
|
||||||
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
|
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
|
||||||
- CONAN_SYSREQUIRES_MODE=enabled conan install . --build=missing -g cmake -if build
|
- CONAN_SYSREQUIRES_MODE=enabled conan install . --build=missing -g cmake -if build
|
||||||
|
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
|
||||||
|
- cd build
|
||||||
|
- make
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- build/
|
- build/
|
||||||
expire_in: 1 days
|
expire_in: 1 days
|
||||||
|
|
||||||
# Unix Build
|
|
||||||
cmake:
|
|
||||||
stage: cmake
|
|
||||||
script:
|
|
||||||
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
|
|
||||||
|
|
||||||
# Unix Build
|
|
||||||
build:
|
|
||||||
stage: build
|
|
||||||
script:
|
|
||||||
- cd build
|
|
||||||
- make
|
|
@ -20,7 +20,7 @@ option(BUILD_DOC "Build documentation" ON) # additional dependency for Doxygen
|
|||||||
option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg or NSIS
|
option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg or NSIS
|
||||||
option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
|
option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
|
||||||
option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
|
option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
|
||||||
option(WinBuild "cross compile for Windows Platform" ON)
|
option(WinBuild "cross compile for Windows Platform" OFF)
|
||||||
|
|
||||||
# helper variables
|
# helper variables
|
||||||
SET(CMAKE_CXX_STANDARD 17)
|
SET(CMAKE_CXX_STANDARD 17)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include <inc/IpHelper.h>
|
#include <IpHelper.h>
|
||||||
#include <inc/Logger.h>
|
#include <Logger.h>
|
||||||
#include "api/IPAPI.h"
|
#include "api/IPAPI.h"
|
||||||
|
|
||||||
std::string IPAPI::getGlobalIp() {
|
std::string IPAPI::getGlobalIp() {
|
||||||
|
Loading…
Reference in New Issue
Block a user