mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
travis-ci: only run one round of the test suite on OSX
The OSX tests seem to run slower, they often timeout. So only run the test suite with the installed version of fdroid, instead of the three rounds that ./complete-ci-tests does.
This commit is contained in:
parent
ab02a6fcc3
commit
43b990505d
17
.travis.yml
17
.travis.yml
@ -19,6 +19,9 @@ matrix:
|
|||||||
env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
|
env: ANDROID_SDK_ROOT=/usr/local/share/android-sdk
|
||||||
env: ANDROID_HOME=/usr/local/share/android-sdk
|
env: ANDROID_HOME=/usr/local/share/android-sdk
|
||||||
|
|
||||||
|
# On Ubuntu/trusty 14.04, the PPA is needed on to provide lots of the
|
||||||
|
# dependencies, but this then also serves as a test of the PPA, which
|
||||||
|
# is used on Windows Subsystem for Linux.
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
@ -46,15 +49,13 @@ android:
|
|||||||
- 'android-sdk-preview-.+'
|
- 'android-sdk-preview-.+'
|
||||||
- 'android-sdk-license-.+'
|
- 'android-sdk-license-.+'
|
||||||
|
|
||||||
# the PPA is needed on Ubuntu 14.04 precise, and with python3, trusty too
|
|
||||||
# the pip thing is a hack that can go away with trusty.
|
|
||||||
#
|
|
||||||
# * ensure java8 is installed since Android SDK doesn't work with Java9
|
# * ensure java8 is installed since Android SDK doesn't work with Java9
|
||||||
# * Java needs to be at least 1.8.0_131 to have MD5 properly disabled
|
# * Java needs to be at least 1.8.0_131 to have MD5 properly disabled
|
||||||
# https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
|
# https://blogs.oracle.com/java-platform-group/oracle-jre-will-no-longer-trust-md5-signed-code-by-default
|
||||||
# https://opsech.io/posts/2017/Jun/09/openjdk-april-2017-security-update-131-8u131-and-md5-signed-jars.html
|
# https://opsech.io/posts/2017/Jun/09/openjdk-april-2017-security-update-131-8u131-and-md5-signed-jars.html
|
||||||
install:
|
install:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
set -x;
|
||||||
brew update > /dev/null;
|
brew update > /dev/null;
|
||||||
brew install dash bash python3 gradle jenv;
|
brew install dash bash python3 gradle jenv;
|
||||||
brew install gnu-sed --with-default-names;
|
brew install gnu-sed --with-default-names;
|
||||||
@ -86,11 +87,19 @@ install:
|
|||||||
which jarsigner;
|
which jarsigner;
|
||||||
keytool -help;
|
keytool -help;
|
||||||
which keytool;
|
which keytool;
|
||||||
|
set +x;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# The OSX tests seem to run slower, they often timeout. So only run
|
||||||
|
# the test suite with the installed version of fdroid, instead of the
|
||||||
|
# three rounds that ./complete-ci-tests does.
|
||||||
script:
|
script:
|
||||||
- cd tests
|
- cd tests
|
||||||
- ./complete-ci-tests
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||||
|
./run-tests;
|
||||||
|
else
|
||||||
|
./complete-ci-tests;
|
||||||
|
fi
|
||||||
|
|
||||||
after_failure:
|
after_failure:
|
||||||
- cd $TRAVIS_BUILD_DIR
|
- cd $TRAVIS_BUILD_DIR
|
||||||
|
Loading…
Reference in New Issue
Block a user