ruki 5 éve
szülő
commit
fc34bd52d8
5 módosított fájl, 25 hozzáadás és 123 törlés
  1. 0 16
      .appveyor.yml
  2. 0 94
      .travis.yml
  3. 12 6
      README.md
  4. 12 6
      README_zh.md
  5. 1 1
      packages/z/zlib/xmake.lua

+ 0 - 16
.appveyor.yml

@@ -1,16 +0,0 @@
-os: 
-  - Visual Studio 2017
-  - Visual Studio 2015
-  - Visual Studio 2013
-
-platform:
-  - Win32
-  - Win64
-
-before_build:
-  - ps: Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-Webrequest "https://raw.githubusercontent.com/tboox/xmake/dev/scripts/get.ps1" -UseBasicParsing).Content)) -ArgumentList "dev"
-  - cmd: xmake --version
-
-build_script:
-  - cmd: xmake l scripts/test.lua -D
-

+ 0 - 94
.travis.yml

@@ -1,94 +0,0 @@
-sudo: false
-language: C
-matrix:
-  include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-      env:
-         - MATRIX_PLAT=linux
-         - MATRIX_CC=gcc-4.9 
-         - MATRIX_CXX=g++-4.9
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-      env:
-        - MATRIX_PLAT=linux
-        - MATRIX_CC=gcc-6 
-        - MATRIX_CXX=g++-6
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-8
-      env:
-        - MATRIX_PLAT=linux
-        - MATRIX_CC=gcc-8
-        - MATRIX_CXX=g++-8
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-      env:
-        - MATRIX_PLAT=android
-
-    - os: osx
-      osx_image: xcode10.3
-      env:
-        - MATRIX_PLAT=osx
-
-    - os: osx
-      osx_image: xcode10.1
-      env:
-        - MATRIX_PLAT=osx
-    
-    - os: osx
-      osx_image: xcode9.4
-      env:
-        - MATRIX_PLAT=osx
-
-    - os: osx
-      env:
-        - MATRIX_PLAT=iphoneos
-
-    - os: osx
-      env:
-        - MATRIX_PLAT=mingw
-
-install:
-  - git clone --branch=dev https://github.com/xmake-io/xmake.git tboox/xmake --depth 1
-  - cd ./tboox/xmake
-  - ./scripts/get.sh __local__
-  - cd -
-  - 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 [ "$MATRIX_PLAT" = "iphoneos" ]; then
-      travis_wait 60 xmake l ./scripts/test.lua -D -p iphoneos;
-    elif [ "$MATRIX_PLAT" = "mingw" ]; then
-      brew install mingw-w64;
-      CC="" CXX="" travis_wait 60 xmake l ./scripts/test.lua -D -p mingw;
-    elif [ "$MATRIX_PLAT" = "android" ]; then 
-      travis_wait 60 xmake l ./scripts/test.lua -D -p android --ndk=`pwd`/android-ndk-r19c;
-    elif [ "$MATRIX_PLAT" = "linux" ]; then 
-      CC=$MATRIX_CC CXX=$MATRIX_CXX travis_wait 60 xmake l ./scripts/test.lua -D;
-    else
-      travis_wait 60 xmake l ./scripts/test.lua -D;
-    fi

+ 12 - 6
README.md

@@ -6,14 +6,17 @@
   <h1>xmake-repo</h1>
 
   <div>
-    <a href="https://travis-ci.org/xmake-io/xmake-repo">
-      <img src="https://img.shields.io/travis/xmake-io/xmake-repo/dev.svg?style=flat-square" alt="travis-ci" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3ALinux">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Linux/dev.svg?style=flat-square&logo=linux" alt="github-ci" />
     </a>
-    <a href="https://ci.appveyor.com/project/waruqi/xmake-repo">
-      <img src="https://img.shields.io/appveyor/ci/waruqi/xmake-repo/dev.svg?style=flat-square" alt="appveyor-ci" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AmacOS">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/macOS/dev.svg?style=flat-square&logo=apple" alt="github-ci" />
     </a>
-    <a href="https://github.com/xmake-io/xmake-repo/blob/master/LICENSE.md">
-      <img src="https://img.shields.io/github/license/xmake-io/xmake-repo.svg?colorB=f48041&style=flat-square" alt="license" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AWindows">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Windows/dev.svg?style=flat-square&logo=windows" alt="github-ci" />
+    </a>
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AAndroid">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Android/dev.svg?style=flat-square&logo=android" alt="github-ci" />
     </a>
   </div>
   <div>
@@ -29,6 +32,9 @@
     <a href="https://jq.qq.com/?_wv=1027&k=5hpwWFv">
       <img src="https://img.shields.io/badge/chat-on%20QQ-ff69b4.svg?style=flat-square" alt="QQ" />
     </a>
+    <a href="https://github.com/xmake-io/xmake-repo/blob/master/LICENSE.md">
+      <img src="https://img.shields.io/github/license/xmake-io/xmake-repo.svg?colorB=f48041&style=flat-square" alt="license" />
+    </a>
     <a href="http://xmake.io/pages/donation.html#donate">
       <img src="https://img.shields.io/badge/donate-us-orange.svg?style=flat-square" alt="Donate" />
     </a>

+ 12 - 6
README_zh.md

@@ -6,14 +6,17 @@
   <h1>xmake-repo</h1>
 
   <div>
-    <a href="https://travis-ci.org/xmake-io/xmake-repo">
-      <img src="https://img.shields.io/travis/xmake-io/xmake-repo/dev.svg?style=flat-square" alt="travis-ci" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3ALinux">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Linux/dev.svg?style=flat-square&logo=linux" alt="github-ci" />
     </a>
-    <a href="https://ci.appveyor.com/project/waruqi/xmake-repo">
-      <img src="https://img.shields.io/appveyor/ci/waruqi/xmake-repo/dev.svg?style=flat-square" alt="appveyor-ci" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AmacOS">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/macOS/dev.svg?style=flat-square&logo=apple" alt="github-ci" />
     </a>
-    <a href="https://github.com/xmake-io/xmake-repo/blob/master/LICENSE.md">
-      <img src="https://img.shields.io/github/license/xmake-io/xmake-repo.svg?colorB=f48041&style=flat-square" alt="license" />
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AWindows">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Windows/dev.svg?style=flat-square&logo=windows" alt="github-ci" />
+    </a>
+    <a href="https://github.com/xmake-io/xmake-repo/actions?query=workflow%3AAndroid">
+      <img src="https://img.shields.io/github/workflow/status/xmake-io/xmake-repo/Android/dev.svg?style=flat-square&logo=android" alt="github-ci" />
     </a>
   </div>
   <div>
@@ -29,6 +32,9 @@
     <a href="https://jq.qq.com/?_wv=1027&k=5hpwWFv">
       <img src="https://img.shields.io/badge/chat-on%20QQ-ff69b4.svg?style=flat-square" alt="QQ" />
     </a>
+    <a href="https://github.com/xmake-io/xmake-repo/blob/master/LICENSE.md">
+      <img src="https://img.shields.io/github/license/xmake-io/xmake-repo.svg?colorB=f48041&style=flat-square" alt="license" />
+    </a>
     <a href="http://xmake.io/pages/donation.html#donate">
       <img src="https://img.shields.io/badge/donate-us-orange.svg?style=flat-square" alt="Donate" />
     </a>

+ 1 - 1
packages/z/zlib/xmake.lua

@@ -19,7 +19,7 @@ package("zlib")
     on_install("linux", "macosx", function (package)
         import("package.tools.autoconf").install(package, {"--static"})
     end)
- 
+
     on_install("iphoneos", "android@linux,macosx", "mingw@linux,macosx", function (package)
         import("package.tools.autoconf").configure(package, {host = "", "--static"})
         io.gsub("Makefile", "\nAR=.-\n",      "\nAR=" .. (package:build_getenv("ar") or "") .. "\n")