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

Merge branch 'niko_devel' into 'master' 

Niko devel

See merge request slam/basalt!2
This commit is contained in:
Vladyslav Usenko 2019-04-25 13:46:19 +00:00
parent abe21fe704 e9e9ce6b9b
commit 4ff7d23451
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -22,10 +22,11 @@ stages:
- mkdir -p ccache - mkdir -p ccache
- export CCACHE_BASEDIR=${PWD} - export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache - export CCACHE_DIR=${PWD}/ccache
- ccache -s
cache: cache:
paths: paths:
- ccache/ - ccache/
key: ${CACHE_KEY} key: ${CI_JOB_NAME}
# template for build & unit test & make deb configurations # template for build & unit test & make deb configurations
.compile_test_package_template: &compile_test_package_definition .compile_test_package_template: &compile_test_package_definition
@ -95,7 +96,6 @@ bionic-release-compile:
variables: variables:
CXX_MARCH: 'corei7-avx' CXX_MARCH: 'corei7-avx'
DEB_DIR: deb_bionic DEB_DIR: deb_bionic
CACHE_KEY: bionic-release
artifacts: artifacts:
paths: paths:
- deb_bionic/*.deb - deb_bionic/*.deb
@ -109,7 +109,6 @@ xenial-release-compile:
variables: variables:
CXX_MARCH: 'corei7-avx' CXX_MARCH: 'corei7-avx'
DEB_DIR: deb_xenial DEB_DIR: deb_xenial
CACHE_KEY: xenial-release
artifacts: artifacts:
paths: paths:
- deb_xenial/*.deb - deb_xenial/*.deb
@ -120,14 +119,12 @@ bionic-debug-compile:
<<: *compile_test_package_definition <<: *compile_test_package_definition
variables: variables:
BUILD_TYPE: Debug BUILD_TYPE: Debug
CACHE_KEY: bionic-debug
bionic-relwithdebinfo-compile: bionic-relwithdebinfo-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
variables: variables:
BUILD_TYPE: RelWithDebInfo BUILD_TYPE: RelWithDebInfo
CACHE_KEY: bionic-relwithdebinfo
elcapitan-relwithdebinfo-compile: elcapitan-relwithdebinfo-compile:
<<: *compile_test_definition <<: *compile_test_definition

2
thirdparty/basalt-headers vendored

@ -1 +1 @@
Subproject commit 292ee346506b73f691b96108cafc53d589e8b7b3 Subproject commit 100a412ff1f0686a2721a1ff602584752a616906