From 7b972148228526c84cb6d5955b64a28ff887761d Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 7 Feb 2021 06:31:33 -0500 Subject: Update test scripts --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index be606b1a..fb5fc54c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -472,8 +472,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=armv7a - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, aarch64, Linux os: linux arch: amd64 @@ -482,8 +482,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=aarch64 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, x86, Linux os: linux arch: amd64 @@ -492,8 +492,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=x86 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: Android, x86_64, Linux os: linux arch: amd64 @@ -502,8 +502,8 @@ jobs: - BUILD_MODE=android - ANDROID_CPU=x86_64 - ANDROID_API=23 - - ANDROID_SDK_ROOT="$HOME/android-sdk" - - ANDROID_NDK_ROOT="$HOME/android-ndk" + - ANDROID_SDK_ROOT="/opt/android-sdk" + - ANDROID_NDK_ROOT="/opt/android-ndk" - name: iPhoneOS, armv7, iOS os: osx osx_image: xcode10.1 @@ -595,7 +595,7 @@ before_install: # https://github.com/travis-ci/travis-ci/issues/9037 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145 sudo apt-get -qq -y update - bash TestScripts/install-ndk.sh + sudo -E TestScripts/install-ndk.sh fi if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "autotools" ]]; then # https://github.com/travis-ci/travis-ci/issues/9037 -- cgit v1.2.1