.travis.yml: move cache flushing to early common phase
We shall be adding more common early setup in a future commit. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200203090932.19147-11-alex.bennee@linaro.org>
This commit is contained in:
parent
204b30e2e2
commit
b3165c874e
13
.travis.yml
13
.travis.yml
@ -82,11 +82,16 @@ git:
|
|||||||
# we want to do this ourselves
|
# we want to do this ourselves
|
||||||
submodules: false
|
submodules: false
|
||||||
|
|
||||||
|
# Common first phase for all steps
|
||||||
before_script:
|
before_install:
|
||||||
- if command -v ccache ; then ccache --zero-stats ; fi
|
- if command -v ccache ; then ccache --zero-stats ; fi
|
||||||
|
|
||||||
|
# Configure step - may be overridden
|
||||||
|
before_script:
|
||||||
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
||||||
- ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
|
- ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
|
||||||
|
|
||||||
|
# Main build & test - rarely overridden - controlled by TEST_CMD
|
||||||
script:
|
script:
|
||||||
- BUILD_RC=0 && make -j3 || BUILD_RC=$?
|
- BUILD_RC=0 && make -j3 || BUILD_RC=$?
|
||||||
- if [ "$BUILD_RC" -eq 0 ] ; then travis_retry ${TEST_CMD} ; else $(exit $BUILD_RC); fi
|
- if [ "$BUILD_RC" -eq 0 ] ; then travis_retry ${TEST_CMD} ; else $(exit $BUILD_RC); fi
|
||||||
@ -268,7 +273,6 @@ matrix:
|
|||||||
before_script:
|
before_script:
|
||||||
- brew link --overwrite python
|
- brew link --overwrite python
|
||||||
- export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
- export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||||
- if command -v ccache ; then ccache --zero-stats ; fi
|
|
||||||
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
||||||
- ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
|
- ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
|
||||||
|
|
||||||
@ -499,9 +503,6 @@ matrix:
|
|||||||
- TEST_CMD="make install -j3"
|
- TEST_CMD="make install -j3"
|
||||||
- QEMU_VERSION="${TRAVIS_TAG:1}"
|
- QEMU_VERSION="${TRAVIS_TAG:1}"
|
||||||
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
|
- CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
|
||||||
before_script:
|
|
||||||
- command -v ccache && ccache --zero-stats
|
|
||||||
- mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
|
|
||||||
script:
|
script:
|
||||||
- make -C ${SRC_DIR} qemu-${QEMU_VERSION}.tar.bz2
|
- make -C ${SRC_DIR} qemu-${QEMU_VERSION}.tar.bz2
|
||||||
- ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2
|
- ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2
|
||||||
|
Loading…
Reference in New Issue
Block a user