ktyl
/
basalt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'niko_devel' into 'master' 

ci updates

See merge request slam/basalt!9
This commit is contained in:
Vladyslav Usenko 2019-05-18 18:01:03 +00:00
parent 7a0dd6cb31 9243201c17
commit 7d29d019ec
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -91,6 +91,8 @@ stages:
bionic-release-compile: bionic-release-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
only:
- master
variables: variables:
CXX_MARCH: 'corei7-avx' CXX_MARCH: 'corei7-avx'
DEB_DIR: deb_bionic DEB_DIR: deb_bionic
@ -125,8 +127,6 @@ bionic-debug-compile:
bionic-relwithdebinfo-compile: bionic-relwithdebinfo-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
only:
- master
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
@ -138,6 +138,14 @@ elcapitan-relwithdebinfo-compile:
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
mojave-relwithdebinfo-compile:
<<: *compile_test_definition
tags: [macos, "10.14"]
only:
- master
variables:
BUILD_TYPE: RelWithDebInfo
# check if clang-format would make any changes # check if clang-format would make any changes
clang-format: clang-format:
tags: tags:
@ -152,6 +160,8 @@ clang-format:
bionic-test: bionic-test:
<<: *test_deb_definition <<: *test_deb_definition
only:
- master
variables: variables:
DEB_DIR: deb_bionic DEB_DIR: deb_bionic
GIT_STRATEGY: none GIT_STRATEGY: none