From b98ee6bdb15923a115a58ffdd476398fd0e95412 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 1 May 2019 00:56:32 +0800 Subject: [PATCH] fix travis for mingw --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58ca9c991..3733ea24a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,7 @@ install: - cd ./tboox/xmake - ./scripts/get.sh __local__ - cd - - - if [ "$TRAVIS_OS_NAME" = "osc" ]; then - brew install mingw-w64; - brew --prefix mingw-w64; - else + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then wget -q https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip; unzip -q -o ./android-ndk-r19c-linux-x86_64.zip; fi @@ -24,7 +21,8 @@ script: - travis_wait 60 xmake l ./scripts/test.lua -D - if [ "$TRAVIS_OS_NAME" = "osx" ]; then travis_wait 60 xmake l ./scripts/test.lua -D -p iphoneos; - travis_wait 60 xmake l ./scripts/test.lua -D -p mingw --mingw=`brew --prefix mingw-w64`; + brew install mingw-w64; + travis_wait 60 CC="" xmake l ./scripts/test.lua -D -p mingw; else travis_wait 60 xmake l ./scripts/test.lua -v -D -p android --ndk=`pwd`/android-ndk-r19c; fi