Merge branch 'niko_devel' into 'master'
ci updates See merge request slam/basalt!9
This commit is contained in:
commit
7d29d019ec
|
@ -91,6 +91,8 @@ stages:
|
|||
bionic-release-compile:
|
||||
<<: *prepare_docker_definition
|
||||
<<: *compile_test_package_definition
|
||||
only:
|
||||
- master
|
||||
variables:
|
||||
CXX_MARCH: 'corei7-avx'
|
||||
DEB_DIR: deb_bionic
|
||||
|
@ -125,8 +127,6 @@ bionic-debug-compile:
|
|||
bionic-relwithdebinfo-compile:
|
||||
<<: *prepare_docker_definition
|
||||
<<: *compile_test_package_definition
|
||||
only:
|
||||
- master
|
||||
variables:
|
||||
BUILD_TYPE: RelWithDebInfo
|
||||
|
||||
|
@ -138,6 +138,14 @@ elcapitan-relwithdebinfo-compile:
|
|||
variables:
|
||||
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
|
||||
clang-format:
|
||||
tags:
|
||||
|
@ -152,6 +160,8 @@ clang-format:
|
|||
|
||||
bionic-test:
|
||||
<<: *test_deb_definition
|
||||
only:
|
||||
- master
|
||||
variables:
|
||||
DEB_DIR: deb_bionic
|
||||
GIT_STRATEGY: none
|
||||
|
|
Loading…
Reference in New Issue