Compare commits

..

No commits in common. "a24ac1eed8c870947405cc14ab480f98ec2dc6fa" and "bc6dc12be5083b168aec4fed66a2e835aa465724" have entirely different histories.

2 changed files with 13 additions and 19 deletions

View File

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

View File

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