.gitlab-ci.yml

@@ -4,13 +4,12 @@ include:
     file: 'scheduled.yml'
 
 smolensk15-nightly:
-#  variables:
-#    CMAKE_GENERATOR: Unix Makefiles
-#    UPDATE_CMD: apt-get update
-#    INSTALL_CMD: apt-get -y install cmake
-#    CONFIGURE_CMD: cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis ..
-#    BUILD_CMD: make -j$(nproc)
-#    PACKAGE_CMD: tar zcf test.tar.gz
+  variables:
+    UPDATE_CMD: apt-get update
+    INSTALL_CMD: apt-get -y install cmake
+    CONFIGURE_CMD: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis ..
+    BUILD_CMD: make -j$(nproc)
+    PACKAGE_CMD: tar zcf test.tar.gz
   extends: .scheduled-smolensk15
 
 orel212-nightly:

scheduled.yml

@@ -3,11 +3,8 @@ variables:
   GET_SOURCES_ATTEMPTS: 10
 
 .scheduled-test:
-  variables:
-    CMAKE_GENERATOR: Ninja
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
-    - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_MERGE_REQUEST_ID
       when: manual
       allow_failure: true
@@ -44,22 +41,22 @@ variables:
       if [ -n "${CONFIGURE_CMD}" ]; then
         ${CONFIGURE_CMD}
       else
-        cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis ..
+        cmake -G Ninja -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis ..
       fi
     - >
       if [ -n "${BUILD_CMD}" ]; then
         ${BUILD_CMD}
       else
-        cmake --build . -- -j $(nproc)
+        ninja -v all
       fi
     - >
       if [ -z "${CI_SHARED_ENVIRONMENT+x}" ]; then
         if [ -n "${PACKAGE_CMD}" ]; then
           ${PACKAGE_CMD}
         else
-          cmake --install .
-          cmake --build . --target package
-          cmake --build . --target package_source
+          ninja -v install
+          ninja package
+          ninja package_source
         fi
       fi
     - echo "${CI_COMMIT_SHA}" > "../${CI_JOB_NAME}.status"
@@ -97,8 +94,6 @@ variables:
   tags: ['elbrus']
 
 .check-format-sources:
-  variables:
-    CMAKE_GENERATOR: Ninja
   image: focal-dev
   tags: ['docker']
   script:
@@ -108,7 +103,7 @@ variables:
       else
         mkdir build
         cd build
-        cmake ..
-        cmake --build . --target check-format-sources
+        cmake -G Ninja ..
+        ninja check-format-sources
       fi