From fa99e2c30b5a704c12f512b941e1d7630d816a7a Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Wed, 24 Apr 2019 23:24:16 +0200 Subject: [PATCH 1/2] ci: use ci-job-name as cache key and print ccache info --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 137ff45..a07711d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,10 +22,11 @@ stages: - mkdir -p ccache - export CCACHE_BASEDIR=${PWD} - export CCACHE_DIR=${PWD}/ccache + - ccache -s cache: paths: - ccache/ - key: ${CACHE_KEY} + key: ${CI_JOB_NAME} # template for build & unit test & make deb configurations .compile_test_package_template: &compile_test_package_definition @@ -95,7 +96,6 @@ bionic-release-compile: variables: CXX_MARCH: 'corei7-avx' DEB_DIR: deb_bionic - CACHE_KEY: bionic-release artifacts: paths: - deb_bionic/*.deb @@ -109,7 +109,6 @@ xenial-release-compile: variables: CXX_MARCH: 'corei7-avx' DEB_DIR: deb_xenial - CACHE_KEY: xenial-release artifacts: paths: - deb_xenial/*.deb @@ -120,14 +119,12 @@ bionic-debug-compile: <<: *compile_test_package_definition variables: BUILD_TYPE: Debug - CACHE_KEY: bionic-debug bionic-relwithdebinfo-compile: <<: *prepare_docker_definition <<: *compile_test_package_definition variables: BUILD_TYPE: RelWithDebInfo - CACHE_KEY: bionic-relwithdebinfo elcapitan-relwithdebinfo-compile: <<: *compile_test_definition From e9e9ce6b9b2de37a7ff80bf2b019882aa6d445da Mon Sep 17 00:00:00 2001 From: Nikolaus Demmel Date: Wed, 24 Apr 2019 18:22:35 +0200 Subject: [PATCH 2/2] submodules: update basalt-headers to master --- thirdparty/basalt-headers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/basalt-headers b/thirdparty/basalt-headers index 292ee34..100a412 160000 --- a/thirdparty/basalt-headers +++ b/thirdparty/basalt-headers @@ -1 +1 @@ -Subproject commit 292ee346506b73f691b96108cafc53d589e8b7b3 +Subproject commit 100a412ff1f0686a2721a1ff602584752a616906