mirror of
https://github.com/scottlamb/moonfire-nvr.git
synced 2024-12-26 15:15:56 -05:00
try upgrading travis-ci setup to xenial
This no longer requires installing ffmpeg manually, so there should be significantly less data to cache (faster runs). The build step itself should also be faster when the cache is unavailable/stale. Also sneak in a change from "pkg-config" to "pkgconf" package in the scripts and travis CI. They didn't match the manual instructions; make them all consistent. They both seem to work fine, but I gather pkgconf is the newer thing. Its roadmap is here and notes that distros are moving toward it. https://github.com/pkgconf/pkgconf/wiki/Roadmap
This commit is contained in:
parent
b5387af3d4
commit
1123adec5d
19
.travis.yml
19
.travis.yml
@ -1,36 +1,29 @@
|
|||||||
dist: trusty
|
dist: xenial
|
||||||
sudo: required
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- build-essential
|
- build-essential
|
||||||
|
- libavcodec-dev
|
||||||
|
- libavformat-dev
|
||||||
|
- libavutil-dev
|
||||||
- libncurses5-dev
|
- libncurses5-dev
|
||||||
- libncursesw5-dev
|
- libncursesw5-dev
|
||||||
- libsqlite3-dev
|
- libsqlite3-dev
|
||||||
- libssl-dev
|
- libssl-dev
|
||||||
- pkg-config
|
- pkgconf
|
||||||
- yasm
|
- yasm
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- language: rust
|
- language: rust
|
||||||
rust: stable
|
rust: stable
|
||||||
env: FFMPEG_VERSION=3.4.4
|
|
||||||
install:
|
|
||||||
- ci/install-ffmpeg.sh
|
|
||||||
script:
|
script:
|
||||||
- ci/script-rust.sh
|
- ci/script-rust.sh
|
||||||
- language: rust
|
- language: rust
|
||||||
rust: nightly
|
rust: nightly
|
||||||
env: FFMPEG_VERSION=3.4.4
|
|
||||||
install:
|
|
||||||
- ci/install-ffmpeg.sh
|
|
||||||
script:
|
script:
|
||||||
- ci/script-rust.sh
|
- ci/script-rust.sh
|
||||||
- language: rust
|
- language: rust
|
||||||
rust: 1.31.0
|
rust: 1.31.0
|
||||||
env: FFMPEG_VERSION=3.4.4
|
|
||||||
install:
|
|
||||||
- ci/install-ffmpeg.sh
|
|
||||||
script:
|
script:
|
||||||
- ci/script-rust.sh
|
- ci/script-rust.sh
|
||||||
- language: node_js
|
- language: node_js
|
||||||
@ -50,6 +43,4 @@ matrix:
|
|||||||
cache:
|
cache:
|
||||||
cargo: true
|
cargo: true
|
||||||
yarn: true
|
yarn: true
|
||||||
directories:
|
|
||||||
- ffmpeg-3.4.4
|
|
||||||
timeout: 600
|
timeout: 600
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash -e
|
|
||||||
if [ ! -f ffmpeg-${FFMPEG_VERSION}/configure ]; then
|
|
||||||
wget https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz
|
|
||||||
tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz
|
|
||||||
fi
|
|
||||||
cd ffmpeg-${FFMPEG_VERSION}
|
|
||||||
./configure --enable-shared
|
|
||||||
make --jobs=2
|
|
||||||
sudo make install --jobs=2
|
|
||||||
sudo ldconfig
|
|
||||||
|
|
||||||
# The build log varies with each invocation; remove it to improve cachability.
|
|
||||||
rm -f ffbuild/config.log
|
|
@ -58,10 +58,13 @@ sudo_warn
|
|||||||
# Setup all apt packages we need
|
# Setup all apt packages we need
|
||||||
#
|
#
|
||||||
echo_info -x 'Preparing and downloading packages we need...'
|
echo_info -x 'Preparing and downloading packages we need...'
|
||||||
PKGS="build-essential pkg-config sqlite3 tzdata"
|
PKGS="build-essential \
|
||||||
#PKGS="$PKGS libavcodec-dev libavformat-dev libavutil-dev"
|
libncurses5-dev \
|
||||||
PKGS="$PKGS libncurses5-dev libncursesw5-dev"
|
libncursesw5-dev \
|
||||||
PKGS="$PKGS libsqlite3-dev libssl-dev"
|
libsqlite3-dev \
|
||||||
|
libssl-dev \
|
||||||
|
pkgconf \
|
||||||
|
tzdata"
|
||||||
|
|
||||||
# Add yarn before NodeSource so it can all go in one update
|
# Add yarn before NodeSource so it can all go in one update
|
||||||
#
|
#
|
||||||
@ -93,7 +96,7 @@ fi
|
|||||||
#
|
#
|
||||||
if [ ${DO_UPDATE:-1} ]; then sudo apt-get update -y; fi
|
if [ ${DO_UPDATE:-1} ]; then sudo apt-get update -y; fi
|
||||||
|
|
||||||
# Install necessary pakackes
|
# Install necessary packages
|
||||||
#
|
#
|
||||||
sudo apt-get install -y $PKGS
|
sudo apt-get install -y $PKGS
|
||||||
sudo apt-get autoremove -y
|
sudo apt-get autoremove -y
|
||||||
|
Loading…
Reference in New Issue
Block a user