From c42ad3213b1fdb3a8cd6580167c34103708d4d25 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sun, 12 May 2019 22:26:32 +0800
Subject: [PATCH] fix ci env

---
 .travis.yml                 | 22 +++++++++++-----------
 packages/p/python/xmake.lua |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb6dd99c2..1b2fafde0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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;
diff --git a/packages/p/python/xmake.lua b/packages/p/python/xmake.lua
index a6a860280..bdc793fa3 100644
--- a/packages/p/python/xmake.lua
+++ b/packages/p/python/xmake.lua
@@ -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()