diff --git a/.travis.yml b/.travis.yml index e5fe18b16..27ebf1ee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,9 +50,6 @@ matrix: env: - MATRIX_PLAT=mingw -before_install: - - eval "${MATRIX_EVAL}" - install: - git clone --branch=dev https://github.com/xmake-io/xmake.git tboox/xmake --depth 1 - cd ./tboox/xmake @@ -64,6 +61,7 @@ install: fi script: + - eval "${MATRIX_EVAL}" - if [ "$MATRIX_PLAT" = "iphoneos" ]; then travis_wait 60 xmake l ./scripts/test.lua -D -p iphoneos; elif [ "$MATRIX_PLAT" = "mingw" ]; then diff --git a/packages/s/skia/xmake.lua b/packages/s/skia/xmake.lua index b1ce56a95..6f0aa35c6 100644 --- a/packages/s/skia/xmake.lua +++ b/packages/s/skia/xmake.lua @@ -30,12 +30,7 @@ package("skia") skia_use_libjpeg_turbo = false, skia_use_libpng = false, skia_use_libwebp = false, - skia_use_zlib = false, - skia_use_system_expat = false, - skia_use_system_libjpeg_turbo = false, - skia_use_system_libpng = false, - skia_use_system_libwebp = false, - skia_use_system_zlib = false} + skia_use_zlib = false} args.cc = package:build_getenv("cc") args.cxx = package:build_getenv("cxx") local argstr = "" @@ -47,7 +42,7 @@ package("skia") end end os.vrun("python2 tools/git-sync-deps") - os.vrun("bin/gn gen build --args='%s'", argstr) + os.vrun("bin/gn gen build --args='%s'", argstr:trim()) os.vrun("ninja -C build") end)