MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2024-12-26 23:25:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

fourth attempt at travis config

Browse Source 
* upgrade min required rust to 1.21; crossbeam-deque requires the
  ord_max_min feature, apparently stabilized in this version.

* use "make --jobs=2" to build ffmpeg so it goes faster.
  https://docs.travis-ci.com/user/reference/overview/ says there are 2
  cores available.
This commit is contained in:
Scott Lamb 2018-08-07 15:51:19 -05:00
parent 62a1bad8b9
commit 01e8dab67f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -4,7 +4,7 @@ language: rust
rust: rust:
- stable - stable
- nightly - nightly
- 1.20.0 - 1.21.0
addons: addons:
apt: apt:
packages: packages:
@ -20,7 +20,7 @@ matrix:
- rust: nightly - rust: nightly
cache: cargo cache: cargo
script: script:
- (git clone --depth 1 -b "release/3.4" https://github.com/FFmpeg/FFmpeg.git && cd FFmpeg && ./configure --enable-shared && make && sudo make install && sudo ldconfig) - (git clone --depth 1 -b "release/3.4" https://github.com/FFmpeg/FFmpeg.git && cd FFmpeg && ./configure --enable-shared && make -jobs=2 && sudo make install --jobs=2 && sudo ldconfig)
- cargo build --verbose --all - cargo build --verbose --all
- cargo test --verbose --all - cargo test --verbose --all
- 'if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo bench --verbose --all; fi' - 'if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo bench --verbose --all; fi'

2
guide/install-manual.md
View File

@ -49,7 +49,7 @@ all non-Rust dependencies:
libssl-dev \ libssl-dev \
pkgconf pkgconf
Next, you need Rust 1.20+ and Cargo. The easiest way to install them is by Next, you need Rust 1.21+ and Cargo. The easiest way to install them is by
following the instructions at [rustup.rs](https://www.rustup.rs/). following the instructions at [rustup.rs](https://www.rustup.rs/).
Finally, building the UI requires [yarn](https://yarnpkg.com/en/). Finally, building the UI requires [yarn](https://yarnpkg.com/en/).

2
scripts/script-functions.sh
View File

@ -40,7 +40,7 @@ fi
NODE_MIN_VERSION="8" NODE_MIN_VERSION="8"
YARN_MIN_VERSION="1.0" YARN_MIN_VERSION="1.0"
CARGO_MIN_VERSION="0.2" CARGO_MIN_VERSION="0.2"
RUSTC_MIN_VERSION="1.20" RUSTC_MIN_VERSION="1.21"
FFMPEG_MIN_VERSION="55.1.101" FFMPEG_MIN_VERSION="55.1.101"
FFMPEG_RELEASE_VERSION="3.4" FFMPEG_RELEASE_VERSION="3.4"