diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/scripts/setup_executor_env.sh | 28 | ||||
| -rw-r--r-- | jjb/tldk/tldk.yaml | 2 |
2 files changed, 13 insertions, 17 deletions
diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index f9aecfa4..a6b8216d 100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -61,25 +61,19 @@ echo "$long_line" echo "DNS nameserver config in '/etc/resolv.conf':" cat /etc/resolv.conf || true -if [ -n "${CCACHE_DIR:-}" ] ; then - echo "$long_line" - if [ -d "$CCACHE_DIR" ] ; then - num_ccache_files="$(find $CCACHE_DIR -type f | wc -l)" - ccache_conf="$CCACHE_DIR/ccache.conf" - echo "CCACHE_DIR='$CCACHE_DIR' ($num_ccache_files ccache files):" - du -sh /tmp/ccache - df -h /tmp/ccache - ls -l $CCACHE_DIR - unset -v CCACHE_DISABLE - if [ -f "$ccache_conf" ] ; then - echo "Contents of $ccache_conf:" - cat $ccache_conf - fi - else +echo "$long_line" +if [ -n "$(which ccache || true)" ] ; then + if [ -z "${CCACHE_DIR:-}" ] || [ ! -d "$CCACHE_DIR" ] ; then echo "CCACHE_DIR='$CCACHE_DIR' is missing, disabling CCACHE..." - unset -v CCACHE_DIR export CCACHE_DISABLE="1" - echo "CCACHE_DISABLE='${CCACHE_DISABLE:-}'" fi + if [ -n "${CCACHE_DISABLE:-}" ] ; then + echo "CCACHE_DISABLE = '$CCACHE_DISABLE'" + fi + echo "ccache statistics:" + ccache -s +else + echo "WARNING: ccache is not installed!" + export CCACHE_DISABLE="1" fi echo "$long_line" diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 1cf86135..191b5920 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -28,6 +28,8 @@ branch: 'master' - dev-next-socket: branch: 'dev-next-socket' + - dev-mitm-proxy: + branch: 'dev-mitm-proxy' - project: name: tldk-view |