Merge remote-tracking branch 'upstream/master'
Merging with latest upstream changes.
This commit is contained in:
commit
54e570c1e3
27
.travis.yml
27
.travis.yml
|
@ -2,16 +2,27 @@ language: rust
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
|
- secure: "ZGNi7bKoxNIziWzdNP1QbH6ZbeWDInq42yq1rzWY71I/pi8yA4zjVAYdgXKElc0saB0d2TxJCwpeGVyXwuXXeNoud8HWsqQxhNVMM8K27a2jeezza8UCCJ7kAS6E/+gQj7w+HFtgWiUHZ0KEjGONqXJM+cWqH5oprTEuNBOPqDA="
|
||||||
- secure: "H7JRHaCkm6NvmMU76pNUyK5fj8d0kEb1snGCTcC4ZdW98P5qSEDbMBOKZgSW0DNhKmzYS1qHHAXlmm9c9JCVYfeErL9JeTrRk4DvIO8sH3ImhHIB/q4U+h+hxZ6W+dGpTi0kjQ5ZS3z+Mlr/9CB4UT83HmF78Zfyf6KA15esUIQ="
|
- secure: "H7JRHaCkm6NvmMU76pNUyK5fj8d0kEb1snGCTcC4ZdW98P5qSEDbMBOKZgSW0DNhKmzYS1qHHAXlmm9c9JCVYfeErL9JeTrRk4DvIO8sH3ImhHIB/q4U+h+hxZ6W+dGpTi0kjQ5ZS3z+Mlr/9CB4UT83HmF78Zfyf6KA15esUIQ="
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install libasound2-dev
|
- sudo apt-get install libasound2-dev
|
||||||
|
|
||||||
after_success: |
|
after_success:
|
||||||
[ $TRAVIS_BRANCH = master ] &&
|
- |
|
||||||
[ $TRAVIS_PULL_REQUEST = false ] &&
|
[ $TRAVIS_BRANCH = master ] &&
|
||||||
cargo doc &&
|
[ $TRAVIS_PULL_REQUEST = false ] &&
|
||||||
echo '<meta http-equiv=refresh content=0;url=cpal/index.html>' > target/doc/index.html &&
|
cargo doc &&
|
||||||
sudo pip install ghp-import &&
|
echo '<meta http-equiv=refresh content=0;url=cpal/index.html>' > target/doc/index.html &&
|
||||||
ghp-import -n target/doc &&
|
sudo pip install ghp-import &&
|
||||||
git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
|
ghp-import -n target/doc &&
|
||||||
|
git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
|
||||||
|
- cargo login ${CRATESIO_TOKEN}
|
||||||
|
- |
|
||||||
|
[ $TRAVIS_BRANCH = master ] &&
|
||||||
|
[ $TRAVIS_PULL_REQUEST = false ] &&
|
||||||
|
cargo publish
|
||||||
|
- |
|
||||||
|
[ $TRAVIS_BRANCH = master ] &&
|
||||||
|
[ $TRAVIS_PULL_REQUEST = false ] &&
|
||||||
|
cd alsa-sys && cargo publish && cd ..
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
|
|
||||||
name = "alsa-sys"
|
name = "alsa-sys"
|
||||||
version = "0.0.3"
|
version = "0.0.4"
|
||||||
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
description = "Bindings for the ALSA project (Advanced Linux Sound Architecture)"
|
description = "Bindings for the ALSA project (Advanced Linux Sound Architecture)"
|
||||||
|
|
Loading…
Reference in New Issue