apache · moonming · Oct 28, 2020 · Sep 10, 2020 · Sep 10, 2020 · Sep 10, 2020
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: CI
+name: CI Linux
 
 on:
   push:
@@ -13,52 +13,35 @@ jobs:
       matrix:
         platform: [ubuntu-18.04]
         os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls]
-        include:
-          - platform: macos-latest
-            os_name: osx_openresty
 
     runs-on: ${{ matrix.platform }}
     env:
       SERVER_NAME: ${{ matrix.os_name }}
 
 
+    services:
+      etcd:
+        image: bitnami/etcd:3.4.0
+        ports: 
+          - 2379:2379
+          - 2380:2380
+        env: 
+          ALLOW_NONE_AUTHENTICATION: yes
+          ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+
+
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-#----------------------------------------------------------------------------
       - name: Linux Get dependencies
-        if: matrix.platform == 'ubuntu-18.04'
-        run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd
+        run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl
 
       - name: Linux Before install
-        if: matrix.platform == 'ubuntu-18.04'
         run: sudo ./.travis/${{ matrix.os_name }}_runner.sh before_install
 
       - name: Linux Install
-        if: matrix.platform == 'ubuntu-18.04'
         run: sudo ./.travis/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Linux Script
-        if: matrix.platform == 'ubuntu-18.04'
         run: sudo ./.travis/${{ matrix.os_name }}_runner.sh script
-
-#       - name: Linux After success
-#         if: matrix.platform == 'ubuntu-18.04'
-#         run: sudo ./.travis/${{ matrix.os_name }}_runner.sh after_success
-#----------------------------------------------------------------------------
-      - name: MacOS Before install
-        if: matrix.platform == 'macos-latest'
-        run: ./.travis/${{ matrix.os_name }}_runner.sh before_install
-
-      - name: MacOS Install
-        if: matrix.platform == 'macos-latest'
-        run: ./.travis/${{ matrix.os_name }}_runner.sh do_install
-
-      - name: MacOS Script
-        if: matrix.platform == 'macos-latest'
-        run: ./.travis/${{ matrix.os_name }}_runner.sh script
-
-#       - name: MacOS After success
-#         if: matrix.platform == 'macos-latest'
-#         run: ./.travis/${{ matrix.os_name }}_runner.sh after_success
diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -0,0 +1,36 @@
+name: CI macOS
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [macos-latest]
+        os_name: [osx_openresty]
+
+    runs-on: ${{ matrix.platform }}
+    env:
+      SERVER_NAME: ${{ matrix.os_name }}
+
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: MacOS Before install
+        if: matrix.platform == 'macos-latest'
+        run: ./.travis/${{ matrix.os_name }}_runner.sh before_install
+
+      - name: MacOS Install
+        if: matrix.platform == 'macos-latest'
+        run: ./.travis/${{ matrix.os_name }}_runner.sh do_install
+
+      - name: MacOS Script
+        if: matrix.platform == 'macos-latest'
+        run: ./.travis/${{ matrix.os_name }}_runner.sh script
diff --git a/.travis/linux_apisix_current_luarocks_runner.sh b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -40,19 +40,13 @@ do_install() {
     cd ..
     rm -rf luarocks-2.4.4
 
-    ./utils/install-etcd.sh
+    ./utils/linux-install-etcd-client.sh
 }
 
 script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd start
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
 
     sudo rm -rf /usr/local/apisix
 

diff --git a/.travis/linux_apisix_master_luarocks_runner.sh b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -41,18 +41,13 @@ do_install() {
     cd ..
     rm -rf luarocks-2.4.4
 
-    ./utils/install-etcd.sh
+    ./utils/linux-install-etcd-client.sh
 }
 
 script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcd --version
-    sleep 5
 
     sudo rm -rf /usr/local/apisix
 

diff --git a/.travis/linux_openresty_mtls_runner.sh b/.travis/linux_openresty_mtls_runner.sh
@@ -59,7 +59,7 @@ do_install() {
 
     sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
 
-    ./utils/install-etcd.sh
+    ./utils/linux-install-etcd-client.sh
 
     if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
         create_lua_deps
@@ -91,11 +91,6 @@ script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
 
 
     # enable mTLS

diff --git a/.travis/linux_openresty_runner.sh b/.travis/linux_openresty_runner.sh
@@ -74,7 +74,7 @@ do_install() {
 
     sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
 
-    ./utils/install-etcd.sh
+    ./utils/linux-install-etcd-client.sh
 
     if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
         create_lua_deps
@@ -127,11 +127,7 @@ script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
+
 
     ./build-cache/grpc_server_example &
 

diff --git a/.travis/linux_tengine_runner.sh b/.travis/linux_tengine_runner.sh
@@ -259,7 +259,7 @@ do_install() {
 
     sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
 
-    ./utils/install-etcd.sh
+    ./utils/linux-install-etcd-client.sh
 
     git clone https://github.com/iresty/test-nginx.git test-nginx
     make utils
@@ -280,11 +280,7 @@ script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
+
 
     ./build-cache/grpc_server_example &
 

diff --git a/utils/linux-install-etcd-client.sh b/utils/linux-install-etcd-client.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+wget https://github.com/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz
+tar xf etcd-v3.4.0-linux-amd64.tar.gz
+sudo cp etcd-v3.4.0-linux-amd64/etcdctl /usr/local/bin/
+rm -rf etcd-v3.4.0-linux-amd64