Update crossbeam version and travis setup (#1109)

.travis.yml

@@ -1,55 +1,41 @@
+# The shaderc dependencies are already installed on the base images
+# so we dont need to worry about installing them.
+dist: xenial
 os:
-    - linux
-    - osx
-
+  - linux
+  - osx
 language: rust
 rust:
-    - nightly
-    - stable
-
+  - nightly
+  - stable
 cache:
   cargo
 
-install:
-    - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export CXX="g++-4.8" ; fi
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    - george-edison55-precise-backports # recent version of cmake
-    packages:
-    - gcc-4.8
-    - g++-4.8 # required to compile glslang
-    - clang
-    - cmake
-    - cmake-data
-
 script:
-    - git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
-    - travis_wait cargo test --all -j 1
-    - cd examples
-    - cargo build
-    - cd .. # this is very important or else the below `cargo publish` will fail
+  - git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
+  - travis_wait cargo test --all -j 2
+  - cd examples
+  - cargo build -j 2
+  - cd .. # this is very important or else the below `cargo publish` will fail
 
 after_success:
-    - |
-        [ $TRAVIS_BRANCH = master ] &&
-        [ $TRAVIS_PULL_REQUEST = false ] &&
-        [ $TRAVIS_OS_NAME = linux ] &&
-        cargo publish --token ${CRATESIO_TOKEN} --manifest-path vk-sys/Cargo.toml
-    - |
-        [ $TRAVIS_BRANCH = master ] &&
-        [ $TRAVIS_PULL_REQUEST = false ] &&
-        [ $TRAVIS_OS_NAME = linux ] &&
-        cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano/Cargo.toml
-    - |
-        [ $TRAVIS_BRANCH = master ] &&
-        [ $TRAVIS_PULL_REQUEST = false ] &&
-        [ $TRAVIS_OS_NAME = linux ] &&
-        cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-win/Cargo.toml
-    - |
-        [ $TRAVIS_BRANCH = master ] &&
-        [ $TRAVIS_PULL_REQUEST = false ] &&
-        [ $TRAVIS_OS_NAME = linux ] &&
-        cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-shaders/Cargo.toml
+  - |
+    [ $TRAVIS_BRANCH = master ] &&
+    [ $TRAVIS_PULL_REQUEST = false ] &&
+    [ $TRAVIS_OS_NAME = linux ] &&
+    cargo publish --token ${CRATESIO_TOKEN} --manifest-path vk-sys/Cargo.toml
+  - |
+    [ $TRAVIS_BRANCH = master ] &&
+    [ $TRAVIS_PULL_REQUEST = false ] &&
+    [ $TRAVIS_OS_NAME = linux ] &&
+    cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano/Cargo.toml
+  - |
+    [ $TRAVIS_BRANCH = master ] &&
+    [ $TRAVIS_PULL_REQUEST = false ] &&
+    [ $TRAVIS_OS_NAME = linux ] &&
+    cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-win/Cargo.toml
+  - |
+    [ $TRAVIS_BRANCH = master ] &&
+    [ $TRAVIS_PULL_REQUEST = false ] &&
+    [ $TRAVIS_OS_NAME = linux ] &&
+    cargo publish --token ${CRATESIO_TOKEN} --manifest-path vulkano-shaders/Cargo.toml

vulkano/Cargo.toml

@@ -13,7 +13,7 @@ readme = "../README.md"
 build = "build.rs"
 
 [dependencies]
-crossbeam = "0.4"
+crossbeam = "0.5"
 fnv = "1.0.6"
 shared_library = "0.1.7"
 smallvec = "0.6.0"