mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Revert "Disable ccache on arm64 build"
This reverts commit e8124729fb
.
It worked once, but soon after that it stopped working again
https://travis-ci.org/ruby/ruby/jobs/598491972
This commit is contained in:
parent
7df227804a
commit
5c80dffd05
1 changed files with 7 additions and 15 deletions
22
.travis.yml
22
.travis.yml
|
@ -73,6 +73,7 @@ env:
|
||||||
- |-
|
- |-
|
||||||
${BEFORE_INSTALL}
|
${BEFORE_INSTALL}
|
||||||
tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
|
||||||
|
ccache \
|
||||||
gcc-8 \
|
gcc-8 \
|
||||||
g++-8 \
|
g++-8 \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
|
@ -126,12 +127,6 @@ env:
|
||||||
name: arm64-linux
|
name: arm64-linux
|
||||||
arch: arm64
|
arch: arm64
|
||||||
<<: *gcc-8
|
<<: *gcc-8
|
||||||
# arm64 build always fails with cache
|
|
||||||
cache:
|
|
||||||
ccache: false
|
|
||||||
directories: []
|
|
||||||
env:
|
|
||||||
- DISABLE_CCACHE=true
|
|
||||||
|
|
||||||
- &jemalloc
|
- &jemalloc
|
||||||
name: --with-jemalloc
|
name: --with-jemalloc
|
||||||
|
@ -430,14 +425,12 @@ before_script:
|
||||||
- chmod -R a-w .
|
- chmod -R a-w .
|
||||||
- chmod -R u+w build config_1st config_2nd
|
- chmod -R u+w build config_1st config_2nd
|
||||||
- cd build
|
- cd build
|
||||||
|
- ccache --show-stats
|
||||||
- |-
|
- |-
|
||||||
if [ "$DISABLE_CCACHE" != true ]; then
|
case "$CC" in
|
||||||
ccache --show-stats
|
gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
|
||||||
case "$CC" in
|
clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
|
||||||
gcc*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
|
esac
|
||||||
clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
- |-
|
- |-
|
||||||
[ ! -f config.cache ] ||
|
[ ! -f config.cache ] ||
|
||||||
[ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
|
[ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
|
||||||
|
@ -465,8 +458,7 @@ before_script:
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
- |-
|
- ccache --show-stats
|
||||||
[ "$DISABLE_CCACHE" = true ] || ccache --show-stats
|
|
||||||
- |-
|
- |-
|
||||||
[ -z "${GEMS_FOR_TEST}" ] ||
|
[ -z "${GEMS_FOR_TEST}" ] ||
|
||||||
$RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
|
$RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
|
||||||
|
|
Loading…
Add table
Reference in a new issue