Fix

This reverts commit 3447ad0970.

.gitlab-ci.yml.example

@@ -0,0 +1,42 @@
+include:
+  - project: 'f1x1t/gitlab-ci'
+    ref: master
+    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
+  extends: .scheduled-smolensk15
+
+orel212-nightly:
+  extends: .scheduled-orel212
+
+bionic-nightly:
+  extends: .scheduled-bionic
+
+focal-nightly:
+  extends: .scheduled-focal
+
+jammy-nightly:
+  extends: .scheduled-jammy
+
+elbrus-nightly:
+  extends: .scheduled-elbrus
+
+check-format-sources:
+  only:
+    - merge_requests
+  extends: .check-format-sources
+
+analyze-pvs:
+  when: manual
+  extends: .analyze-pvs
+
+analyze-clang-tidy:
+  when: manual
+  extends: .analyze-clang-tidy

README.md

@@ -1,22 +1,19 @@
 # Шаблон для автосборки проекта
 
-Скопировать файл `scheduled.yml` в каталог проекта `.gitlab-ci` и
+Скопировать файл `.gitlab-ci.yml` в каталог проекта.
-подключить его в файле `.gitlab-ci.yml`. Пример:
 
-```yaml
+Переменная `UPDATE_CMD` содержит команду для обновления репозитория пакетов
-include:
+в контейнере, выполняющем сборку проекта.
-  - local: /.gitlab-ci/scheduled.yml
 
-smolensk15-nightly:
+Переменная `INSTALL_CMD` содержит команду для установки дополнительных пакетов
-  extends: .scheduled-smolensk15
+в контейнер, выполняющий сборку проекта.
 
-orel212-nightly:
+Переменная `CONFIGURE_CMD` содержит команду конфигурирования проекта,
-  extends: .scheduled-orel212
+если стандатный вариант не подходит.
 
-bionic-nightly:
+Переменная `BUILD_CMD` содержит команду сборки проекта,
-  extends: .scheduled-bionic
+если стандатный вариант не подходит.
 
-elbrus-nightly:
+Переменная `PACKAGE_CMD` содержит команду упаковки результов сборки проекта,
-  extends: .scheduled-elbrus
+если стандатный вариант не подходит.
-```
 

scheduled.yml

@@ -1,11 +1,91 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   GET_SOURCES_ATTEMPTS: 10
+  CI_SOURCE_DIR: .
+  CI_BUILD_DIR: _build
+  CI_OUTPUT_DIR: _output
+  CI_CMAKE: /usr/bin/cmake
+  CI_QMAKE5: /usr/bin/qmake
+
+.add-ssh-key:
+  before_script:
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - eval $(ssh-agent -s)
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+    - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+
+.use-clang:
+  variables:
+    CXX: clang++-14
+    CC: clang-14
+
+.use-ninja:
+  variables:
+    CMAKE_GENERATOR: Ninja
+
+.qmake-script:
+  variables:
+    QT_SELECT: qt5
+  script:
+    - >
+      if [ -f "${CI_JOB_NAME}.status" ]; then
+        if [ "$(cat ${CI_JOB_NAME}.status)" == "${CI_COMMIT_SHA}" ]; then
+          echo "=== Commit ${CI_COMMIT_SHORT_SHA} already tested with job ${CI_JOB_NAME} ==="
+          exit 0
+        fi
+      fi
+    - rm -f ${CI_JOB_NAME}.status
+    - mkdir -p ${CI_BUILD_DIR}
+    - ${CI_QMAKE} -o ${CI_BUILD_DIR}/Makefile ${QMAKE_PRO_FILE}
+    - make -j8 -C ${CI_BUILD_DIR}
+    - echo "${CI_COMMIT_SHA}" > "${CI_JOB_NAME}.status"
+
+
+.cmake-script:
+  extends: .use-ninja
+  script:
+    - >
+      if [ -f "${CI_JOB_NAME}.status" ]; then
+        if [ "$(cat ${CI_JOB_NAME}.status)" == "${CI_COMMIT_SHA}" ]; then
+          echo "=== Commit ${CI_COMMIT_SHORT_SHA} already tested with job ${CI_JOB_NAME} ==="
+          exit 0
+        fi
+      fi
+    - rm -f ${CI_JOB_NAME}.status
+    - >
+      if [ -n "${CONFIGURE_CMD}" ]; then
+        ${CONFIGURE_CMD}
+      else
+        ${CI_CMAKE} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CI_OUTPUT_DIR} -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/ecs5 -B${CI_BUILD_DIR} -H.
+      fi
+    - >
+      if [ -n "${BUILD_CMD}" ]; then
+        ${BUILD_CMD}
+      else
+        ${CI_CMAKE} --build ${CI_BUILD_DIR}
+      fi
+    - >
+      if [ -z "${CI_SHARED_ENVIRONMENT+x}" ]; then
+        if [ -n "${PACKAGE_CMD}" ]; then
+          ${PACKAGE_CMD}
+        else
+          ${CI_CMAKE} --install ${CI_BUILD_DIR}
+          ${CI_CMAKE} --build ${CI_BUILD_DIR} --target package || true
+          ${CI_CMAKE} --build ${CI_BUILD_DIR} --target package_source || true
+        fi
+      fi
+    - echo "${CI_COMMIT_SHA}" > "${CI_JOB_NAME}.status"
+
 
 .scheduled-test:
-  only:
+  extends: .cmake-script
-    refs:
+  rules:
-      - schedules
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "web"
+    - if: $CI_MERGE_REQUEST_ID
+      when: manual
+      allow_failure: true
   cache:
     paths: ['*.status']
   before_script:
@@ -17,62 +97,243 @@ variables:
         fi
       fi
     - >
-      if [ -n "${APT_UPDATE_CMD}" ]; then
+      if [ -n "${UPDATE_CMD}" ]; then
-        ${APT_UPDATE_CMD}
+        ${UPDATE_CMD}
       fi
     - >
-      if [ -n "${APT_INSTALL_CMD}" ]; then
+      if [ -n "${INSTALL_CMD}" ]; then
-        ${APT_INSTALL_CMD}
+        ${INSTALL_CMD}
       fi
-  script:
-    - >
-      if [ -f "${CI_JOB_NAME}.status" ]; then
-        if [ "$(cat ${CI_JOB_NAME}.status)" == "${CI_COMMIT_SHA}" ]; then
-          echo "=== Commit ${CI_COMMIT_SHORT_SHA} already tested with job ${CI_JOB_NAME} ==="
-          exit 0
-        fi
-      fi
-    - rm -f ${CI_JOB_NAME}.status
-    - mkdir build
-    - cd build
-    - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=_output -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rtis ..
-    - ninja
-    - >
-      if [ -z "${CI_SHARED_ENVIRONMENT+x}" ]; then
-        ninja install
-        ninja package
-        ninja package_source
-      fi
-    - echo "${CI_COMMIT_SHA}" > "../${CI_JOB_NAME}.status"
   artifacts:
     paths:
-      - build/*.xz
+      - ${CI_BUILD_DIR}/*.gz
-      - build/*.deb
+      - ${CI_BUILD_DIR}/*.xz
+      - ${CI_BUILD_DIR}/*.deb
+      - ${CI_BUILD_DIR}/*.changes
+      - ${CI_BUILD_DIR}/*.dsc
     when: on_success
     expire_in: 10 days
 
+.scheduled-mxe-focal-shared-large:
+  variables:
+    CI_QMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.shared-qmake-qt5
+    CI_CMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.shared-cmake
+    CI_USE_MXE: 1
+  extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: mxe-focal-shared-large
+  tags: ['docker']
+
+.scheduled-mxe-focal-static-large:
+  variables:
+    CI_QMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5
+    CI_CMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake
+    CI_USE_MXE: 1
+  extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: mxe-focal-static-large
+  tags: ['docker']
 
 .scheduled-smolensk15:
   extends: .scheduled-test
   image: smolensk15-dev
   tags: ['docker']
 
+.scheduled-smolensk16:
+  extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: smolensk16-dev
+  tags: ['docker']
+
+.scheduled-smolensk17:
+  extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: smolensk17-dev
+  tags: ['docker']
+
 .scheduled-orel212:
   extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
   image: orel212-dev
   tags: ['docker']
 
 .scheduled-bionic:
   extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
   image: bionic-dev
   tags: ['docker']
 
 .scheduled-focal:
   extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
   image: focal-dev
   tags: ['docker']
 
+.scheduled-jammy:
+  extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: jammy-dev
+  tags: ['docker']
+
 .scheduled-elbrus:
   extends: .scheduled-test
+  before_script:
+    - !reference [.add-ssh-key, before_script]
   tags: ['elbrus']
 
+
+.check-format-sources:
+  extends: .use-ninja
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: jammy-dev
+  tags: ['format']
+  script:
+    - ${CI_CMAKE} -B ${CI_BUILD_DIR} .
+    - ${CI_CMAKE} --build ${CI_BUILD_DIR} --target check-format-sources
+
+.myx-uncrustify-check:
+  extends: .use-ninja
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: jammy-dev
+  tags: ['format']
+  script:
+    - ${CI_CMAKE} -B ${CI_BUILD_DIR} .
+    - ${CI_CMAKE} --build ${CI_BUILD_DIR} --target myx-uncrustify-check
+
+.format-sources-check-custom:
+  extends: .use-ninja
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: jammy-dev
+  tags: ['format']
+  script:
+    - >
+      if [ -n "${CHECK_FORMAT_SOURCES_CMD}" ]; then
+        ${CHECK_FORMAT_SOURCES_CMD}
+      fi
+
+
+.qmake-analyze-pvs-studio:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
+    - bear -- make -k -j$(nproc)
+    - pvs-studio-analyzer analyze -a 29 -j$(nproc)
+    - plog-converter -a "GA:1,2,3;64:1;OP:1,2;CS:1,2" -t errorfile PVS-Studio.log
+
+.qmake-analyze-clang-tidy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-clang
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
+    - bear -- make -k -j$(nproc)
+    - run-clang-tidy-14 -checks=-*,bugprone-*,clang-analyzer-*,misc-*,modernize-*,performance-*,portability-*
+
+.qmake-analyze-clazy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-clang
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_QMAKE} ${QMAKE_PRO_FILE}
+    - bear -- make -k -j$(nproc)
+    - find . -name "*.cpp" -print0 | xargs -0 clazy-standalone --ignore-dirs=/usr -checks=level2 -p compile_commands.json
+
+
+.cmake-analyze-pvs-studio:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - >
+      if [ -n "${CUSTOM_ANALYZE_PVS}" ]; then
+        ${CUSTOM_ANALYZE_PVS}
+      else
+        ${CI_CMAKE} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -B ${CI_BUILD_DIR} .
+        pvs-studio-analyzer analyze -a 29 -f ${CI_BUILD_DIR}/compile_commands.json -j -o ${CI_BUILD_DIR}/PVS-Studio.log
+        plog-converter -a "GA:1,2,3;64:1;OP:1,2;CS:1,2" -t errorfile ${CI_BUILD_DIR}/PVS-Studio.log
+      fi
+
+.cmake-analyze-clang-tidy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  extends: .use-clang
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - >
+      if [ -n "${CUSTOM_ANALYZE_CLANG_TIDY}" ]; then
+        ${CUSTOM_ANALYZE_CLANG_TIDY}
+      else
+        ${CI_CMAKE} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -B ${CI_BUILD_DIR} .
+        run-clang-tidy-14 -checks=-*,bugprone-*,clang-analyzer-*,misc-*,modernize-*,performance-*,portability-* -p ${CI_BUILD_DIR}
+      fi
+
+.cmake-analyze-clazy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  extends: .use-clang
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - >
+      if [ -n "${CUSTOM_ANALYZE_CLAZY}" ]; then
+        ${CUSTOM_ANALYZE_CLAZY}
+      else
+        ${CI_CMAKE} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -B ${CI_BUILD_DIR} .
+        find . -name "*.cpp" -print0 | xargs -0 clazy-standalone --ignore-dirs=/usr -checks=level2 -p ${CI_BUILD_DIR}/compile_commands.json
+      fi
+
+
+.myxx-analyze-pvs-studio:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_CMAKE} -B ${CI_BUILD_DIR} .
+    - ${CI_CMAKE} --build ${CI_BUILD_DIR} --target myxx-analyze-pvs-studio --parallel
+
+.myxx-analyze-clang-tidy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  extends: .use-clang
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_CMAKE} -B ${CI_BUILD_DIR} .
+    - ${CI_CMAKE} --build ${CI_BUILD_DIR} --target myxx-analyze-clang-tidy --parallel
+
+.myxx-analyze-clazy:
+  before_script:
+    - !reference [.add-ssh-key, before_script]
+  extends: .use-ninja
+  image: jammy-dev
+  tags: ['analyze']
+  script:
+    - ${CI_CMAKE} -B ${CI_BUILD_DIR} .
+    - ${CI_CMAKE} --build ${CI_BUILD_DIR} --target myxx-analyze-clazy --parallel
+