Skip to content

Commit

Permalink
Merge pull request #4 from peterjc123/migrate_to_official_nvcc
Browse files Browse the repository at this point in the history
Adapt to upstream changes
  • Loading branch information
ezyang authored Jun 7, 2020
2 parents c91ac10 + 9ec67ea commit fae16d3
Show file tree
Hide file tree
Showing 32 changed files with 1,583 additions and 920 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ jobs:
rustup component add clippy
rustup component add rustfmt
# Travis doesn't enforce this yet.
# - name: check formatting
# run: cargo fmt -- --check
- name: check formatting
run: cargo fmt -- --check

- name: build and test
run: cargo test --locked --all-targets
Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ matrix:
include:
# OS compat
- os: linux
# As of this writing, stable Rust (1.44.0) and the OS X version on TravisCI
# do not work well together.
- os: osx
rust: 1.43.1

# rustc version compat
- rust: 1.41.1 # oldest supported version, keep in sync with README.md
Expand All @@ -29,6 +32,7 @@ matrix:

before_script:
- export EXTRA_FEATURES=
- if [[ "${TRAVIS_RUST_VERSION}" = "stable" ]]; then rustup component add rustfmt && cargo fmt -- --check; fi
- if [[ "${TRAVIS_RUST_VERSION}" = "nightly" ]]; then export EXTRA_FEATURES="$EXTRA_FEATURES unstable"; fi
- if [[ "${DIST_SCCACHE}" = "1" ]]; then export EXTRA_FEATURES="$EXTRA_FEATURES dist-client dist-server"; fi

Expand Down
Loading

0 comments on commit fae16d3

Please sign in to comment.