Browse Source

Tools: update CI ccache version to 3.3.4

ccache 3.3.x uses CPP2 enabled by default so remove enabling it
mission-4.1.18
Francisco Ferreira 8 years ago
parent
commit
83359e898a
No known key found for this signature in database
GPG Key ID: F63C20A6773E787E
  1. 4
      Tools/scripts/build_ci.sh
  2. 7
      Tools/scripts/configure-ci.sh

4
Tools/scripts/build_ci.sh

@ -19,10 +19,6 @@ export NUTTX_GIT_VERSION="ci_test" @@ -19,10 +19,6 @@ export NUTTX_GIT_VERSION="ci_test"
export PX4_GIT_VERSION="ci_test"
export CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"
if [[ "$cxx_compiler" == "clang++" ]]; then
export CCACHE_CPP2="true"
fi
# If CI_BUILD_TARGET is not set, build 3 different ones
if [ -z "$CI_BUILD_TARGET" ]; then
CI_BUILD_TARGET="sitl linux px4-v2"

7
Tools/scripts/configure-ci.sh

@ -12,7 +12,7 @@ ARM_TARBALL="$ARM_ROOT-20150921-linux.tar.bz2" @@ -12,7 +12,7 @@ ARM_TARBALL="$ARM_ROOT-20150921-linux.tar.bz2"
RPI_ROOT="master"
RPI_TARBALL="$RPI_ROOT.tar.gz"
CCACHE_ROOT="ccache-3.2.5"
CCACHE_ROOT="ccache-3.3.4"
CCACHE_TARBALL="$CCACHE_ROOT.tar.bz2"
mkdir -p $HOME/opt
@ -32,9 +32,12 @@ if [ ! -d "$HOME/opt/$dir" ]; then @@ -32,9 +32,12 @@ if [ ! -d "$HOME/opt/$dir" ]; then
tar -xf $RPI_TARBALL -C opt $dir
fi
# CCache
# ccache
dir=$CCACHE_ROOT
if [ ! -d "$HOME/opt/$dir" ]; then
# if version 3 isn't there, try to remove older v2 folders from CI cache
rm -rf "$HOME/opt"/ccache-3.2*
wget https://www.samba.org/ftp/ccache/$CCACHE_TARBALL
tar -xf $CCACHE_TARBALL
pushd $CCACHE_ROOT

Loading…
Cancel
Save