nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 23:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #471

Browse Source 
471: Run clippy only when not on nightly r=kvark a=yanchith

... otherwise run `check`

https://github.com/gfx-rs/wgpu/pull/468#issuecomment-577451412

Co-authored-by: yanchith <yanchi.toth@gmail.com>
This commit is contained in:
bors[bot] 2020-01-23 15:54:16 +00:00 committed by GitHub
commit b7cdf90cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.travis.yml
View File

@ -8,34 +8,49 @@ matrix:
- os: linux - os: linux
rust: stable rust: stable
compiler: gcc compiler: gcc
env:
- BUILD_COMMAND=clippy
#TODO: unlock when libglfw3 on Ubuntu comes with Vulkan support #TODO: unlock when libglfw3 on Ubuntu comes with Vulkan support
# or when we add a GL backend. # or when we add a GL backend.
#- os: linux #- os: linux
# rust: nightly # rust: nightly
# compiler: gcc # compiler: gcc
# env:
# - BUILD_COMMAND=check
# Windows 64bit # Windows 64bit
- os: windows - os: windows
rust: stable rust: stable
env:
- BUILD_COMMAND=clippy
- os: windows - os: windows
rust: nightly rust: nightly
env:
- BUILD_COMMAND=check
# macOS 64bit # macOS 64bit
- env: MACOSX_DEPLOYMENT_TARGET=10.9 - os: osx
os: osx osx_image: xcode9.4
rust: stable rust: stable
osx_image: xcode9.4
compiler: clang compiler: clang
- env: MACOSX_DEPLOYMENT_TARGET=10.9 env:
os: osx - MACOSX_DEPLOYMENT_TARGET=10.9
- BUILD_COMMAND=clippy
- os: osx
osx_image: xcode9.4
rust: nightly rust: nightly
osx_image: xcode9.4
compiler: clang compiler: clang
env:
- MACOSX_DEPLOYMENT_TARGET=10.9
- BUILD_COMMAND=check
# iPhoneOS 64bit # iPhoneOS 64bit
- env: TARGET=aarch64-apple-ios - os: osx
os: osx
osx_image: xcode11 osx_image: xcode11
rust: stable rust: stable
env:
- TARGET=aarch64-apple-ios
- BUILD_COMMAND=clippy
addons: addons:
apt: apt:
@ -58,16 +73,16 @@ before_install:
- if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then rustup default nightly-msvc; fi - if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then rustup default nightly-msvc; fi
before_script: before_script:
- rustup component add clippy - if [[ $BUILD_COMMAND == "clippy" ]]; then rustup component add clippy; fi
script: script:
- cargo test - cargo test
# TODO: enable GL backend # TODO: enable GL backend
- (cd wgpu-core && cargo clippy --all-features) - (cd wgpu-core && cargo $BUILD_COMMAND --all-features)
- (cd wgpu-native && cargo clippy) - (cd wgpu-native && cargo $BUILD_COMMAND)
- (cd wgpu-remote && cargo clippy --all-features) - (cd wgpu-remote && cargo $BUILD_COMMAND --all-features)
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then (cd wgpu-native && cargo clippy --features vulkan-portability); fi - if [[ $TRAVIS_OS_NAME == "osx" ]]; then (cd wgpu-native && cargo $BUILD_COMMAND --features vulkan-portability); fi
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then cargo clippy --release; fi - if [[ $TRAVIS_OS_NAME == "linux" ]]; then cargo $BUILD_COMMAND --release; fi
- if [[ $TRAVIS_RUST_VERSION == "nightly" ]]; then cargo +nightly install cbindgen; fi - if [[ $TRAVIS_RUST_VERSION == "nightly" ]]; then cargo +nightly install cbindgen; fi
- if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then - if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then
wget -nc -O glfw.zip https://github.com/glfw/glfw/archive/3.3.zip && wget -nc -O glfw.zip https://github.com/glfw/glfw/archive/3.3.zip &&