File tree Expand file tree Collapse file tree 4 files changed +15
-11
lines changed Expand file tree Collapse file tree 4 files changed +15
-11
lines changed Original file line number Diff line number Diff line change 77
77
dist : xenial
78
78
compiler : gcc
79
79
env :
80
- - MATRIX_EVAL="BUILD_TYPE=Release && NO_MESON=1 "
80
+ - MATRIX_EVAL="BUILD_TYPE=Release && SKIP_MESON=yes "
81
81
82
82
- os : osx
83
83
osx_image : xcode11.3
@@ -107,6 +107,7 @@ jobs:
107
107
108
108
install :
109
109
# setup env:
110
+ - eval "${MATRIX_EVAL}"
110
111
- source ci/travis/install-$TRAVIS_OS_NAME.sh
111
112
112
113
script :
Original file line number Diff line number Diff line change 1
- # AvCpp [ ![ Build Status] ( https://travis-ci.org /h4tr3d/avcpp.svg?branch=master )] ( https://travis-ci.org /h4tr3d/avcpp ) [ ![ Language grade: C/C++] ( https://img.shields.io/lgtm/grade/cpp/g/h4tr3d/avcpp.svg?logo=lgtm&logoWidth=18 )] ( https://lgtm.com/projects/g/h4tr3d/avcpp/context:cpp ) [ ![ PRs Welcome] ( https://img.shields.io/badge/PRs-welcome-brightgreen.svg )] ( http://makeapullrequest.com )
1
+ # AvCpp [ ![ Build Status] ( https://travis-ci.com /h4tr3d/avcpp.svg?branch=master )] ( https://travis-ci.com /h4tr3d/avcpp ) [ ![ Language grade: C/C++] ( https://img.shields.io/lgtm/grade/cpp/g/h4tr3d/avcpp.svg?logo=lgtm&logoWidth=18 )] ( https://lgtm.com/projects/g/h4tr3d/avcpp/context:cpp ) [ ![ PRs Welcome] ( https://img.shields.io/badge/PRs-welcome-brightgreen.svg )] ( http://makeapullrequest.com )
2
2
3
3
Wrapper for the FFmpeg that simplify usage it from C++ projects.
4
4
Original file line number Diff line number Diff line change @@ -77,10 +77,12 @@ echo "Prepare FFmpeg"
77
77
libswscale-dev
78
78
)
79
79
80
- echo " Prepare Meson"
81
- (
82
- sudo apt-get install -y python3-pip python3-setuptools ninja-build
83
- sudo -H python3 -m pip install meson
84
- )
80
+ if [ -z " $SKIP_MESON " ]; then
81
+ echo " Prepare Meson"
82
+ (
83
+ sudo apt-get install -y python3-pip python3-setuptools ninja-build
84
+ sudo -H python3 -m pip install meson
85
+ )
86
+ fi
85
87
86
88
set +e
Original file line number Diff line number Diff line change @@ -24,12 +24,13 @@ meson_build() {
24
24
}
25
25
26
26
main () {
27
- if [ x " $NO_MESON " = x " 1 " ]; then
27
+ if [ -n " $SKIP_MESON " ]; then
28
28
echo " Meson build skipped"
29
- else
30
- meson_build || return 1
29
+ return 0
31
30
fi
32
- return 0
31
+
32
+ meson_build
33
+ return $?
33
34
}
34
35
35
36
main
You can’t perform that action at this time.
0 commit comments