From dba70c08c7f9487a96523b4c4f73f0850be0c94d Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 30 Jun 2021 16:36:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=20=D0=B4=D0=BB=D1=8F=20cmake=20=D0=B7=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D1=91=D1=82=D1=81=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scheduled.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scheduled.yml b/scheduled.yml index ca5cce4..4f202d0 100644 --- a/scheduled.yml +++ b/scheduled.yml @@ -3,6 +3,8 @@ variables: GET_SOURCES_ATTEMPTS: 10 .scheduled-test: + variables: + CMAKE_GENERATOR: Ninja rules: - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_MERGE_REQUEST_ID @@ -41,7 +43,7 @@ variables: if [ -n "${CONFIGURE_CMD}" ]; then ${CONFIGURE_CMD} else - cmake -G Ninja -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis .. + cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis .. fi - > if [ -n "${BUILD_CMD}" ]; then @@ -94,6 +96,8 @@ variables: tags: ['elbrus'] .check-format-sources: + variables: + CMAKE_GENERATOR: Ninja image: focal-dev tags: ['docker'] script: @@ -103,7 +107,7 @@ variables: else mkdir build cd build - cmake -G Ninja .. + cmake .. cmake --build . --target check-format-sources fi