Skip to content

Commit b19c076

Browse files
authored
Travis fix (#95)
* Travis: process SKIP_MESON on packages install stage * Change Travis status link
1 parent b453eaa commit b19c076

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
dist: xenial
7878
compiler: gcc
7979
env:
80-
- MATRIX_EVAL="BUILD_TYPE=Release && NO_MESON=1"
80+
- MATRIX_EVAL="BUILD_TYPE=Release && SKIP_MESON=yes"
8181

8282
- os: osx
8383
osx_image: xcode11.3
@@ -107,6 +107,7 @@ jobs:
107107

108108
install:
109109
# setup env:
110+
- eval "${MATRIX_EVAL}"
110111
- source ci/travis/install-$TRAVIS_OS_NAME.sh
111112

112113
script:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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)
22

33
Wrapper for the FFmpeg that simplify usage it from C++ projects.
44

ci/travis/install-linux.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ echo "Prepare FFmpeg"
7777
libswscale-dev
7878
)
7979

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
8587

8688
set +e

ci/travis/meson-build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ meson_build() {
2424
}
2525

2626
main() {
27-
if [ x"$NO_MESON" = x"1" ]; then
27+
if [ -n "$SKIP_MESON" ]; then
2828
echo "Meson build skipped"
29-
else
30-
meson_build || return 1
29+
return 0
3130
fi
32-
return 0
31+
32+
meson_build
33+
return $?
3334
}
3435

3536
main

0 commit comments

Comments
 (0)