Skip to content

Commit f89132a

Browse files
committed
SAIL: Apply JPEG disabling patch only once
1 parent b88eb25 commit f89132a

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

.travis.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ jobs:
3030

3131
before_script:
3232
- |-
33+
fail_on_error()
34+
{
35+
if [ $# -eq 0 ]; then
36+
echo "Error: No arguments given for fail_on_error()" >&2
37+
exit 1
38+
fi
39+
40+
set -e
41+
"$@"
42+
set +e
43+
}
44+
3345
case "$TRAVIS_OS_NAME" in
3446
windows)
3547
# Build non-existing extra libs
@@ -38,11 +50,13 @@ before_script:
3850
build_script_time=$(git log --pretty=format:%cd -n 1 --date=unix --date-order -- extra/build)
3951
4052
if [ $build_script_time -gt $extra_bin_time ]; then
41-
extra/build
53+
fail_on_error extra/build
4254
fi
4355
else
44-
extra/build
56+
fail_on_error extra/build
4557
fi
58+
59+
fail_on_error git apply .travis/disable-jpeg-test-files.patch
4660
;;
4761
linux)
4862
# Workaround ASAN bug in Jammy
@@ -132,8 +146,6 @@ script:
132146
133147
case "$TRAVIS_OS_NAME" in
134148
windows)
135-
fail_on_error git -C .. apply .travis/disable-jpeg-test-files.patch
136-
137149
CMAKE_INSTALL_PREFIX="C:/SAIL"
138150
139151
fail_on_error cmake -A x64 -DBUILD_SHARED_LIBS="$BUILD_SHARED_LIBS" -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \

0 commit comments

Comments
 (0)