diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08e22a084..d68c35f9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,6 @@ variables: DOCKER_IMAGE: registry.git.rwth-aachen.de/acs/public/villas/node DOCKER_IMAGE_DEV: ${DOCKER_IMAGE}/dev-${DISTRO} DOCKER_CLI_EXPERIMENTAL: enabled - MAKE_OPTS: "-j16" CMAKE_BUILD_OPTS: "--config Release --parallel 16" stages: @@ -49,8 +48,8 @@ build:source: stage: build image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} script: - - cmake -S . -B build ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. - - cmake --build build ${CMAKE_BUILD_OPTS} + - cmake -S . -B build ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} + - cmake --build build ${CMAKE_BUILD_OPTS} artifacts: expire_in: 1 week paths: @@ -126,9 +125,8 @@ test:unit: stage: test image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} script: - - mkdir -p build && cd build - - cmake ${CMAKE_OPTS} .. - - make ${MAKE_OPTS} run-unit-tests + - cmake -S . -B build ${CMAKE_OPTS} + - cmake --build build ${CMAKE_BUILD_OPTS} --target run-unit-tests tags: - docker needs: @@ -139,9 +137,8 @@ test:integration: stage: test image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} script: - - mkdir -p build && cd build - - cmake ${CMAKE_OPTS} .. - - make ${MAKE_OPTS} run-integration-tests + - cmake -S . -B build ${CMAKE_OPTS} + - cmake --build build ${CMAKE_BUILD_OPTS} --target run-integration-tests artifacts: name: ${CI_PROJECT_NAME}-integration-tests-${CI_BUILD_REF} when: always