[incubator-apisix] branch master updated: * CI: Github action run non-OSX test case, Travis-CI runs the OSX test case(allow failure). (#1860)

[me...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new cff822b  * CI: Github action run non-OSX test case, Travis-CI runs the OSX test case(allow failure). (#1860)
cff822b is described below

commit cff822b7ae1d89971dca0c9ac1d8f5e0ff976b2e
Author: YuanSheng Wang <me...@gmail.com>
AuthorDate: Fri Jul 17 15:27:08 2020 +0800

    * CI: Github action run non-OSX test case, Travis-CI runs the OSX test case(allow failure). (#1860)
    
    * test: reformat by `reindex`.
    * CI: dry-run the OSX CI in Github Action.
---
 .github/workflows/build.yml     |  2 +-
 .travis.yml                     | 16 ----------------
 .travis/osx_openresty_runner.sh | 16 ++++++++++++++++
 t/router/multi-ssl-certs.t      |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df044a5..5d9712b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       SERVER_NAME: ${{ matrix.os_name }}
 
 
-    steps:        
+    steps:
       - name: Check out code
         uses: actions/checkout@v2
 
diff --git a/.travis.yml b/.travis.yml
index ac7c27f..db66805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,28 +5,12 @@ matrix:
   allow_failures:
     - os: osx
   include:
-    - os: linux
-      services:
-        - docker
-      env: OSNAME=linux_openresty
     - os: osx
       env: OSNAME=osx_openresty
       cache:
         directories:
           - $HOME/Library/Caches/Homebrew
           - /usr/local/Homebrew
-    - os: linux
-      services:
-        - docker
-      env: OSNAME=linux_tengine
-    - os: linux
-      services:
-        - docker
-      env: OSNAME=linux_apisix_master_luarocks
-    - os: linux
-      services:
-        - docker
-      env: OSNAME=linux_apisix_current_luarocks
 
 language: c
 
diff --git a/.travis/osx_openresty_runner.sh b/.travis/osx_openresty_runner.sh
index 0f60eb9..b31e9de 100755
--- a/.travis/osx_openresty_runner.sh
+++ b/.travis/osx_openresty_runner.sh
@@ -23,6 +23,10 @@ export_or_prefix() {
 }
 
 before_install() {
+    if [ "$TRAVIS_OS_NAME" == "" ]; then
+        exit 0
+    fi
+
     HOMEBREW_NO_AUTO_UPDATE=1 brew install perl cpanminus etcd luarocks openresty/brew/openresty-debug redis@3.2
     brew upgrade go
 
@@ -36,6 +40,10 @@ before_install() {
 }
 
 do_install() {
+    if [ "$TRAVIS_OS_NAME" == "" ]; then
+        exit 0
+    fi
+
     export_or_prefix
 
     make deps
@@ -52,6 +60,10 @@ do_install() {
 }
 
 script() {
+    if [ "$TRAVIS_OS_NAME" == "" ]; then
+        exit 0
+    fi
+
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
 
@@ -78,6 +90,10 @@ script() {
 }
 
 after_success() {
+    if [ "$TRAVIS_OS_NAME" == "" ]; then
+        exit 0
+    fi
+
     $PWD/deps/bin/luacov-coveralls
 }
 
diff --git a/t/router/multi-ssl-certs.t b/t/router/multi-ssl-certs.t
index 61fe22a..6c968cb 100644
--- a/t/router/multi-ssl-certs.t
+++ b/t/router/multi-ssl-certs.t
@@ -341,7 +341,7 @@ we have more than 1 ssl certs now
 
 
 
-=== TEST 19: remove test ssl certs 
+=== TEST 8: remove test ssl certs 
 --- config
 location /t {
     content_by_lua_block {