Skip to content
Snippets Groups Projects
Commit 8814bb53 authored by Eidolon's avatar Eidolon
Browse files

Put ccache dirs in build dir to avoid dirty worktree

Placing these directories at the root will make the git revision
detection consider the working directory to be dirty.
parent e42b5c2c
No related branches found
Tags SRB2_release_2.1.21
No related merge requests found
...@@ -4,13 +4,13 @@ osxcross x86_64: ...@@ -4,13 +4,13 @@ osxcross x86_64:
stage: build stage: build
cache: cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
fallback_keys: fallback_keys:
- cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH - ccache-$CI_JOB_NAME_SLUG-$CI_DEFAULT_BRANCH
- cache-$CI_PROJECT_PATH_SLUG-default - ccache-$CI_JOB_NAME_SLUG-master
paths: paths:
- ccache - build/ccache
- ccache_statslog - build/ccache_statslog
- key: apt-$CI_JOB_IMAGE - key: apt-$CI_JOB_IMAGE
paths: paths:
......
...@@ -6,13 +6,13 @@ Windows x86: ...@@ -6,13 +6,13 @@ Windows x86:
when: on_success when: on_success
cache: cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
fallback_keys: fallback_keys:
- cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH - ccache-$CI_JOB_NAME_SLUG-$CI_DEFAULT_BRANCH
- cache-$CI_PROJECT_PATH_SLUG-default - ccache-$CI_JOB_NAME_SLUG-master
paths: paths:
- ccache - build/ccache
- ccache_statslog - build/ccache_statslog
- key: apt-$CI_JOB_IMAGE - key: apt-$CI_JOB_IMAGE
paths: paths:
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:stable
cache: cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
fallback_keys: fallback_keys:
- cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH - ccache-$CI_JOB_NAME_SLUG-$CI_DEFAULT_BRANCH
- cache-$CI_PROJECT_PATH_SLUG-default - ccache-$CI_JOB_NAME_SLUG-master
paths: paths:
- ccache - build/ccache
- ccache_statslog - build/ccache_statslog
- key: apt-$CI_JOB_IMAGE - key: apt-$CI_JOB_IMAGE
paths: paths:
...@@ -100,19 +100,19 @@ ...@@ -100,19 +100,19 @@
echo Adding ccache configution option echo Adding ccache configution option
- | - |
# base_dir # base_dir
echo base_dir = $PWD | tee --append ~/.ccache/ccache.conf echo base_dir = $CI_PROJECT_DIR | tee --append ~/.ccache/ccache.conf
- | - |
# cache_dir # cache_dir
echo cache_dir = $PWD/ccache | tee --append ~/.ccache/ccache.conf echo cache_dir = $CI_PROJECT_DIR/build/ccache | tee --append ~/.ccache/ccache.conf
- | - |
# compiler_check # compiler_check
echo compiler_check = content | tee --append ~/.ccache/ccache.conf echo compiler_check = content | tee --append ~/.ccache/ccache.conf
- | - |
# stats_log # stats_log
echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf echo stats_log = $CI_PROJECT_DIR/build/ccache_statslog | tee --append ~/.ccache/ccache.conf
- | - |
# max_size # max_size
echo max_size = 300M | tee --append ~/.ccache/ccache.conf echo max_size = 300M | tee --append ~/.ccache/ccache.conf
- | - |
# ccache_config # ccache_config
echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K" echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment