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

Merge branch 'small_change_ci' into 'master' 

small changes to ci

See merge request slam/basalt!7
This commit is contained in:
Vladyslav Usenko 2019-05-15 13:06:37 +00:00
parent 696587058d fda3f71205
commit 68e627f736
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -104,6 +104,8 @@ xenial-release-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
image: vladyslavusenko/b_image_xenial:latest image: vladyslavusenko/b_image_xenial:latest
only:
- master
variables: variables:
CXX_MARCH: 'corei7-avx' CXX_MARCH: 'corei7-avx'
DEB_DIR: deb_xenial DEB_DIR: deb_xenial
@ -115,18 +117,24 @@ xenial-release-compile:
bionic-debug-compile: bionic-debug-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
only:
- master
variables: variables:
BUILD_TYPE: Debug BUILD_TYPE: Debug
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
elcapitan-relwithdebinfo-compile: elcapitan-relwithdebinfo-compile:
<<: *compile_test_definition <<: *compile_test_definition
tags: [macos, "10.11"] tags: [macos, "10.11"]
only:
- master
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
@ -151,6 +159,8 @@ bionic-test:
xenial-test: xenial-test:
<<: *test_deb_definition <<: *test_deb_definition
image: vladyslavusenko/b_image_xenial:latest image: vladyslavusenko/b_image_xenial:latest
only:
- master
variables: variables:
DEB_DIR: deb_xenial DEB_DIR: deb_xenial
GIT_STRATEGY: none GIT_STRATEGY: none