Skip to content

Commit fa252da

Browse files
author
MarcoFalke
committed
ci: Remove hardcoded CCACHE_DIR in cirrus
This makes it easier to overwrite the value. Also, drop the dot in the CCACHE_DIR fallback value, because the folder in the scratch dir does not need and probably should not be hidden.
1 parent fa14690 commit fa252da

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

.cirrus.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ env: # Global defaults
44
MAKEJOBS: "-j10"
55
TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
66
CI_FAILFAST_TEST_LEAVE_DANGLING: "1" # Cirrus CI does not care about dangling processes and setting this variable avoids killing the CI script itself on error
7-
CCACHE_DIR: "/tmp/ccache_dir"
87

98
# A self-hosted machine(s) can be used via Cirrus CI. It can be configured with
109
# multiple users to run tasks in parallel. No sudo permission is required.

ci/test/00_setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export CCACHE_TEMPDIR=${CCACHE_TEMPDIR:-/tmp/.ccache-temp}
5858
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
5959
# The cache dir.
6060
# This folder exists only on the ci guest, and on the ci host as a volume.
61-
export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
61+
export CCACHE_DIR="${CCACHE_DIR:-$BASE_SCRATCH_DIR/ccache}"
6262
# Folder where the build result is put (bin and lib).
6363
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
6464
# The folder for previous release binaries.

0 commit comments

Comments
 (0)