Don't specify os: linux more than needed

This commit is contained in:
Jon Gjengset 2019-03-18 22:24:39 -04:00
parent c0e1fbba0c
commit 63f898c4bd
No known key found for this signature in database
GPG key ID: F8FBEB3BC15B735B

View file

@ -4,6 +4,7 @@ rust:
- stable - stable
- beta - beta
- nightly - nightly
os: linux
# always test things that aren't pushes (like PRs) # always test things that aren't pushes (like PRs)
# never test tags or pushes to non-master branches (wait for PR) # never test tags or pushes to non-master branches (wait for PR)
@ -16,7 +17,7 @@ before_script:
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.9; 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.9;
fi fi
# an entry in stage=test will be generated for each rust/os combination. # an entry in stage=test will be generated for each rust version.
# each entry will run these commands. # each entry will run these commands.
script: script:
- cargo test --examples - cargo test --examples
@ -30,7 +31,6 @@ jobs:
stage: check # do a pre-screen to make sure this is even worth testing stage: check # do a pre-screen to make sure this is even worth testing
script: cargo check --all-targets script: cargo check --all-targets
rust: stable rust: stable
os: linux
# <1.24 doesn't work because of lazy-static 1.2.0 # <1.24 doesn't work because of lazy-static 1.2.0
# <1.26.2 doesn't work because of nom 4.1.1 # <1.26.2 doesn't work because of nom 4.1.1
- <<: *check # also test oldest known-good stable - <<: *check # also test oldest known-good stable
@ -51,7 +51,6 @@ jobs:
packages: packages:
- libssl-dev - libssl-dev
rust: stable rust: stable
os: linux
- <<: *integration - <<: *integration
rust: beta rust: beta
- <<: *integration - <<: *integration
@ -59,25 +58,21 @@ jobs:
- stage: lint # we lint on beta to future-proof - stage: lint # we lint on beta to future-proof
name: "Rust: beta, rustfmt" name: "Rust: beta, rustfmt"
rust: beta rust: beta
os: linux
script: script:
- rustup component add rustfmt-preview - rustup component add rustfmt-preview
- cargo fmt -v -- --check - cargo fmt -v -- --check
- name: "Rust: nightly, rustfmt" # and on nightly with allow_fail - name: "Rust: nightly, rustfmt" # and on nightly with allow_fail
rust: nightly rust: nightly
os: linux
script: script:
- rustup component add rustfmt-preview - rustup component add rustfmt-preview
- cargo fmt -v -- --check - cargo fmt -v -- --check
- name: "Rust: beta, clippy" - name: "Rust: beta, clippy"
rust: beta rust: beta
os: linux
script: script:
- rustup component add clippy-preview - rustup component add clippy-preview
- touch ./src/lib.rs && cargo clippy -- -D warnings - touch ./src/lib.rs && cargo clippy -- -D warnings
- name: "Rust: nightly, clippy" - name: "Rust: nightly, clippy"
rust: nightly rust: nightly
os: linux
script: script:
- rustup component add clippy-preview - rustup component add clippy-preview
- touch ./src/lib.rs && cargo clippy -- -D warnings - touch ./src/lib.rs && cargo clippy -- -D warnings