diff options
| -rw-r--r-- | .gitlab-ci.yml | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 171ac52..9ea774d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,11 @@ stages: - build - - test - coverage default: image: registry.source.arknet.ch/fmorgner/turns/ci:latest -build: +build-and-test: stage: build variables: CMAKE_INSTALL_PREFIX: "ch.arknet.Turns" @@ -15,6 +14,7 @@ build: - cmake --preset default - cmake --build --preset default --config $BUILD_TYPE - cmake --install build --config $BUILD_TYPE + - ctest --preset default --build-config $BUILD_TYPE artifacts: paths: - ${CMAKE_INSTALL_PREFIX}/ @@ -26,23 +26,6 @@ build: - Debug - MinSizeRel -test: - stage: test - script: - - weston --no-config --socket=$WAYLAND_DISPLAY --backend=headless & - - ctest --preset default --build-config $BUILD_TYPE - artifacts: - paths: - - build/**/*.gcda - - build/**/*.gcno - - build/**/*.res.c - expire_in: 24 hours - parallel: - matrix: - - BUILD_TYPE: - - Debug - - MinSizeRel - coverage: stage: coverage script: @@ -56,7 +39,7 @@ coverage: - coverage.info expire_in: 24 hours needs: - - job: test + - job: build-and-test parallel: matrix: - BUILD_TYPE: Debug |