Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 0467062

Browse files
authored
Merge branch 'master' into fix-run-method
2 parents efca49f + 89e1548 commit 0467062

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1+
2+
13
before_install:
2-
- sudo add-apt-repository ppa:sauce/ppa -y
3-
- sudo apt-get update -q
4-
- sudo apt-get install flvtool2 -y
5-
matrix:
4+
- gem install flvtool2
5+
6+
jobs:
67
include:
78
- os: linux
89
env: NODE_VERSION=8
910
- os: linux
1011
env: NODE_VERSION=10
1112
- os: linux
1213
env: NODE_VERSION=11
14+
1315
script:
1416
- tools/test-travis.sh
17+
1518
addons:
1619
apt:
1720
packages:

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = process.env.FLUENTFFMPEG_COV ? require('./lib-cov/fluent-ffmpeg') : require('./lib/fluent-ffmpeg');
1+
module.exports = require(`./lib${process.env.FLUENTFFMPEG_COV ? '-cov' : ''}/fluent-ffmpeg`);

0 commit comments

Comments
 (0)