Browse Source

fix travis for mingw

ruki 6 years ago
parent
commit
b98ee6bdb1
1 changed files with 3 additions and 5 deletions
  1. 3 5
      .travis.yml

+ 3 - 5
.travis.yml

@@ -12,10 +12,7 @@ install:
   - cd ./tboox/xmake
   - cd ./tboox/xmake
   - ./scripts/get.sh __local__
   - ./scripts/get.sh __local__
   - cd -
   - 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;
       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;
       unzip -q -o ./android-ndk-r19c-linux-x86_64.zip;
     fi
     fi
@@ -24,7 +21,8 @@ script:
   - travis_wait 60 xmake l ./scripts/test.lua -D
   - travis_wait 60 xmake l ./scripts/test.lua -D
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
   - 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 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
     else
       travis_wait 60 xmake l ./scripts/test.lua -v -D -p android --ndk=`pwd`/android-ndk-r19c;
       travis_wait 60 xmake l ./scripts/test.lua -v -D -p android --ndk=`pwd`/android-ndk-r19c;
     fi
     fi