pull/18/head
ruki 6 years ago
parent 3b7fd2a758
commit c42ad3213b
No known key found for this signature in database
GPG Key ID: 33341DF9719963FA
  1. 22
      .travis.yml
  2. 2
      packages/p/python/xmake.lua

@ -10,8 +10,8 @@ matrix:
packages:
- g++-4.9
env:
- MATRIX_PLAT=linux
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- PLAT=linux
- os: linux
addons:
@ -21,8 +21,8 @@ matrix:
packages:
- g++-6
env:
- MATRIX_PLAT=linux
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
- PLAT=linux
- os: linux
addons:
@ -30,25 +30,25 @@ matrix:
sources:
- ubuntu-toolchain-r-test
env:
- PLAT=android
- MATRIX_PLAT=android
- os: osx
osx_image: xcode10.1
env:
- PLAT=osx
- MATRIX_PLAT=osx
- os: osx
osx_image: xcode9.4
env:
- PLAT=osx
- MATRIX_PLAT=osx
- os: osx
env:
- PLAT=iphoneos
- MATRIX_PLAT=iphoneos
- os: osx
env:
- PLAT=mingw
- MATRIX_PLAT=mingw
before_install:
- eval "${MATRIX_EVAL}"
@ -58,18 +58,18 @@ install:
- cd ./tboox/xmake
- ./scripts/get.sh __local__
- cd -
- if [ "$PLAT" = "android" ]; then
- if [ "$MATRIX_PLAT" = "android" ]; 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
script:
- if [ "$PLAT" = "iphoneos" ]; then
- if [ "$MATRIX_PLAT" = "iphoneos" ]; then
travis_wait 60 xmake l ./scripts/test.lua -D -p iphoneos;
elif [ "$PLAT" = "mingw" ]; then
elif [ "$MATRIX_PLAT" = "mingw" ]; then
brew install mingw-w64;
CC="" travis_wait 60 xmake l ./scripts/test.lua -D -p mingw;
elif [ "$PLAT" = "android" ]; then
elif [ "$MATRIX_PLAT" = "android" ]; then
travis_wait 60 xmake l ./scripts/test.lua -v -D -p android --ndk=`pwd`/android-ndk-r19c;
else
travis_wait 60 xmake l ./scripts/test.lua -D;

@ -39,7 +39,7 @@ package("python")
if is_host("macosx", "linux") then
add_deps("openssl", {host = true})
end
on_load(function (package)
package:data_set("install_resources", function()

Loading…
Cancel
Save