sander/rust-imap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid separate cache for integration tests

Browse source 
Travis uses [several factors](https://docs.travis-ci.com/user/caching/#caches-and-build-matrices)
to determine whether a given job shares a cache with a different job. In
particular, it uses any environment variables specified in
`.travis.yml`. Previously, integration tests set `INTEGRATION=true`,
which meant that the integration tests did not share a cache with the
non-integration tests, even though the compilation is exactly the same.

This patch fixes that by remvoing the `INTEGRATION` environment variable
and instead using the globally available
[`$TRAVIS_BUILD_STAGE_NAME`](https://docs.travis-ci.com/user/environment-variables/#default-environment-variables)
to run the setup required for integration tests only in stages that run
integration tests (namely integration and coverage). Now, the test and
integration stages share all the parameters that Travis uses to
determine cache identifiers, and so they'll share their cache!

Coverage still uses its own cache because it specifically needs to *not*
cache the compiled crate, but *does* need to cache `cargo-tarpaulin`.
This commit is contained in:
Jon Gjengset 2018-11-25 15:30:49 -05:00
parent b9db23b6cb
commit 5309102a1a
No known key found for this signature in database
GPG key ID: D64AC9D67176DC71
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -11,7 +11,7 @@ rust:
if: type != push OR (tag IS blank AND branch = master) if: type != push OR (tag IS blank AND branch = master)
before_script: before_script:
- if [[ "$INTEGRATION" == "true" ]]; then - if [[ "$TRAVIS_BUILD_STAGE_NAME" == "Integration" || "$TRAVIS_BUILD_STAGE_NAME" == "Coverage" ]]; then
docker pull greenmail/standalone:1.5.8 && docker pull greenmail/standalone:1.5.8 &&
docker run -d -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.8; docker run -d -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.8;
fi fi
@ -50,7 +50,6 @@ jobs:
apt: apt:
packages: packages:
- libssl-dev - libssl-dev
env: INTEGRATION=true
rust: stable rust: stable
os: linux os: linux
- <<: *integration - <<: *integration
@ -85,7 +84,7 @@ jobs:
- <<: *integration - <<: *integration
stage: coverage stage: coverage
rust: nightly rust: nightly
env: CACHE_NAME=coverage INTEGRATION=true env: CACHE_NAME=coverage
script: script:
- RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin || true - RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin || true
- cargo tarpaulin --out Xml - cargo tarpaulin --out Xml
@ -99,4 +98,4 @@ stages:
- coverage - coverage
after_failure: after_failure:
- if [[ "$INTEGRATION" == "true" ]]; then docker logs $(docker ps -q); fi - if [[ "$TRAVIS_BUILD_STAGE_NAME" == "Integration" || "$TRAVIS_BUILD_STAGE_NAME" == "Coverage" ]]; then docker logs $(docker ps -q); fi