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

Merge pull request #104 from jonhoo/no-extra-ci-caching

Browse source 
Avoid separate cache for integration tests
This commit is contained in:
Jon Gjengset 2018-11-25 16:14:13 -05:00 • committed by GitHub
commit b20488af56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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