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

ci: fix caching

This commit is contained in:
Nikolaus Demmel 2019-04-24 17:03:39 +02:00
parent a53f3126d5
commit db8655b3d8
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@ -25,6 +25,7 @@ stages:
cache: cache:
paths: paths:
- ccache/ - ccache/
key: ${CACHE_KEY}
# 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
@ -91,11 +92,10 @@ stages:
bionic-release-compile: bionic-release-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
cache:
key: bionic-release
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
@ -106,11 +106,10 @@ 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
cache:
key: xenial-release
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
@ -119,18 +118,16 @@ xenial-release-compile:
bionic-debug-compile: bionic-debug-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
cache:
key: bionic-debug
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
cache:
key: bionic-relwithdebinfo
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 5f9fc492564cb81f51f0b71508c037db712ee5d1 Subproject commit 292ee346506b73f691b96108cafc53d589e8b7b3