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/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 664c760 ci: the last day of travis (#3926)
664c760 is described below
commit 664c76016786c7070bee9e4bf2ffcd6916279444
Author: 罗泽轩 <[email protected]>
AuthorDate: Mon Mar 29 23:34:01 2021 +0800
ci: the last day of travis (#3926)
---
.github/workflows/build.yml | 8 ++++----
.gitignore | 3 +--
Makefile | 8 ++++----
{.travis => ci}/ASF-Release.cfg | 2 +-
{.travis => ci}/ASFLicenseHeaderMarkdown.txt | 0
{.travis => ci}/common.sh | 0
{.travis => ci}/linux_apisix_current_luarocks_runner.sh | 2 +-
{.travis => ci}/linux_apisix_master_luarocks_runner.sh | 2 +-
{.travis => ci}/linux_openresty_1_15_runner.sh | 2 +-
{.travis => ci}/linux_openresty_1_17_runner.sh | 2 +-
{.travis => ci}/linux_openresty_common_runner.sh | 6 +++---
{.travis => ci}/linux_openresty_mtls_runner.sh | 6 +++---
{.travis => ci}/linux_openresty_runner.sh | 2 +-
{.travis => ci}/linux_tengine_runner.sh | 6 +++---
docs/en/latest/install-dependencies.md | 2 +-
docs/zh/latest/install-dependencies.md | 2 +-
t/node/healthcheck-ipv6.t | 10 +---------
t/node/remote-addr-ipv6.t | 10 +---------
t/node/upstream-ipv6.t | 10 +---------
utils/centos7-ci.sh | 2 +-
20 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce34539..9110be8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,14 +70,14 @@ jobs:
- name: Remove source code
if: ${{ startsWith(github.ref, 'refs/heads/release/') &&
!endsWith(matrix.os_name, 'luarocks') }}
run: |
- rm -rf $(ls -1 --ignore=*.tgz --ignore=.travis --ignore=t
--ignore=utils --ignore=.github)
+ rm -rf $(ls -1 --ignore=*.tgz --ignore=ci --ignore=t --ignore=utils
--ignore=.github)
tar zxvf ${{ steps.branch_env.outputs.fullname }}
- name: Linux Get dependencies
run: sudo apt install -y cpanminus build-essential libncurses5-dev
libreadline-dev libssl-dev perl
- name: Linux Before install
- run: sudo ./.travis/${{ matrix.os_name }}_runner.sh before_install
+ run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
- name: Start Dubbo Backend
if: matrix.os_name == 'linux_openresty'
@@ -140,10 +140,10 @@ jobs:
- name: Linux Install
run: |
sudo --preserve-env=OPENRESTY_VERSION \
- ./.travis/${{ matrix.os_name }}_runner.sh do_install
+ ./ci/${{ matrix.os_name }}_runner.sh do_install
- name: Linux Script
- run: sudo ./.travis/${{ matrix.os_name }}_runner.sh script
+ run: sudo ./ci/${{ matrix.os_name }}_runner.sh script
- name: Publish Artifact
if: ${{ startsWith(github.ref, 'refs/heads/release/') &&
matrix.os_name == 'linux_openresty' }}
diff --git a/.gitignore b/.gitignore
index 691ed4e..98b0b7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,8 +61,7 @@ t/lib/dubbo-backend/dubbo-backend-provider/target/
*.iml
\.*
!.github/
-!.travis/
-.travis/openwhisk-utilities/
+ci/openwhisk-utilities/
!.gitmodules
!.markdownlint.yml
!.yamllint
diff --git a/Makefile b/Makefile
index 83fd0a7..f4d1e97 100644
--- a/Makefile
+++ b/Makefile
@@ -240,11 +240,11 @@ test:
### license-check: Check Lua source code for Apache License
.PHONY: license-check
license-check:
-ifeq ("$(wildcard .travis/openwhisk-utilities/scancode/scanCode.py)", "")
- git clone https://github.com/apache/openwhisk-utilities.git
.travis/openwhisk-utilities
- cp .travis/ASF* .travis/openwhisk-utilities/scancode/
+ifeq ("$(wildcard ci/openwhisk-utilities/scancode/scanCode.py)", "")
+ git clone https://github.com/apache/openwhisk-utilities.git
ci/openwhisk-utilities
+ cp ci/ASF* ci/openwhisk-utilities/scancode/
endif
- .travis/openwhisk-utilities/scancode/scanCode.py --config
.travis/ASF-Release.cfg ./
+ ci/openwhisk-utilities/scancode/scanCode.py --config ci/ASF-Release.cfg
./
release-src: compress-tar
diff --git a/.travis/ASF-Release.cfg b/ci/ASF-Release.cfg
similarity index 99%
rename from .travis/ASF-Release.cfg
rename to ci/ASF-Release.cfg
index b4ba843..10de19f 100644
--- a/.travis/ASF-Release.cfg
+++ b/ci/ASF-Release.cfg
@@ -90,7 +90,7 @@ t/lib/dubbo-backend/dubbo-backend-provider/target
t/lib/dubbo-backend/dubbo-backend-interface/target
conf
-.travis/openwhisk-utilities
+ci/openwhisk-utilities
# Exclude test toolkit files
t/toolkit
diff --git a/.travis/ASFLicenseHeaderMarkdown.txt
b/ci/ASFLicenseHeaderMarkdown.txt
similarity index 100%
rename from .travis/ASFLicenseHeaderMarkdown.txt
rename to ci/ASFLicenseHeaderMarkdown.txt
diff --git a/.travis/common.sh b/ci/common.sh
similarity index 100%
rename from .travis/common.sh
rename to ci/common.sh
diff --git a/.travis/linux_apisix_current_luarocks_runner.sh
b/ci/linux_apisix_current_luarocks_runner.sh
similarity index 98%
rename from .travis/linux_apisix_current_luarocks_runner.sh
rename to ci/linux_apisix_current_luarocks_runner.sh
index 7c660a8..e055c4c 100755
--- a/.travis/linux_apisix_current_luarocks_runner.sh
+++ b/ci/linux_apisix_current_luarocks_runner.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
do_install() {
export_or_prefix
diff --git a/.travis/linux_apisix_master_luarocks_runner.sh
b/ci/linux_apisix_master_luarocks_runner.sh
similarity index 99%
rename from .travis/linux_apisix_master_luarocks_runner.sh
rename to ci/linux_apisix_master_luarocks_runner.sh
index 747f6da..c889ed2 100755
--- a/.travis/linux_apisix_master_luarocks_runner.sh
+++ b/ci/linux_apisix_master_luarocks_runner.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
do_install() {
export_or_prefix
diff --git a/.travis/linux_openresty_1_15_runner.sh
b/ci/linux_openresty_1_15_runner.sh
similarity index 94%
rename from .travis/linux_openresty_1_15_runner.sh
rename to ci/linux_openresty_1_15_runner.sh
index cc619ba..e02cc1c 100755
--- a/.travis/linux_openresty_1_15_runner.sh
+++ b/ci/linux_openresty_1_15_runner.sh
@@ -18,4 +18,4 @@
export OPENRESTY_VERSION=1.15.8.2
-. ./.travis/linux_openresty_common_runner.sh
+. ./ci/linux_openresty_common_runner.sh
diff --git a/.travis/linux_openresty_1_17_runner.sh
b/ci/linux_openresty_1_17_runner.sh
similarity index 94%
rename from .travis/linux_openresty_1_17_runner.sh
rename to ci/linux_openresty_1_17_runner.sh
index 39d8333..b0cbde7 100755
--- a/.travis/linux_openresty_1_17_runner.sh
+++ b/ci/linux_openresty_1_17_runner.sh
@@ -18,4 +18,4 @@
export OPENRESTY_VERSION=1.17.8.2
-. ./.travis/linux_openresty_common_runner.sh
+. ./ci/linux_openresty_common_runner.sh
diff --git a/.travis/linux_openresty_common_runner.sh
b/ci/linux_openresty_common_runner.sh
similarity index 98%
rename from .travis/linux_openresty_common_runner.sh
rename to ci/linux_openresty_common_runner.sh
index d6ed7b6..1fa81b7 100755
--- a/.travis/linux_openresty_common_runner.sh
+++ b/ci/linux_openresty_common_runner.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
before_install() {
sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit
1)
@@ -74,8 +74,8 @@ do_install() {
git clone https://github.com/iresty/test-nginx.git test-nginx
make utils
- git clone https://github.com/apache/openwhisk-utilities.git
.travis/openwhisk-utilities
- cp .travis/ASF* .travis/openwhisk-utilities/scancode/
+ git clone https://github.com/apache/openwhisk-utilities.git
ci/openwhisk-utilities
+ cp ci/ASF* ci/openwhisk-utilities/scancode/
ls -l ./
if [ ! -f "build-cache/grpc_server_example_20210122" ]; then
diff --git a/.travis/linux_openresty_mtls_runner.sh
b/ci/linux_openresty_mtls_runner.sh
similarity index 97%
rename from .travis/linux_openresty_mtls_runner.sh
rename to ci/linux_openresty_mtls_runner.sh
index 386c04d..f8ff7a0 100755
--- a/.travis/linux_openresty_mtls_runner.sh
+++ b/ci/linux_openresty_mtls_runner.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
before_install() {
sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit
1)
@@ -52,8 +52,8 @@ do_install() {
git clone https://github.com/iresty/test-nginx.git test-nginx
make utils
- git clone https://github.com/apache/openwhisk-utilities.git
.travis/openwhisk-utilities
- cp .travis/ASF* .travis/openwhisk-utilities/scancode/
+ git clone https://github.com/apache/openwhisk-utilities.git
ci/openwhisk-utilities
+ cp ci/ASF* ci/openwhisk-utilities/scancode/
ls -l ./
}
diff --git a/.travis/linux_openresty_runner.sh b/ci/linux_openresty_runner.sh
similarity index 94%
rename from .travis/linux_openresty_runner.sh
rename to ci/linux_openresty_runner.sh
index eb1e985..2e39224 100755
--- a/.travis/linux_openresty_runner.sh
+++ b/ci/linux_openresty_runner.sh
@@ -18,4 +18,4 @@
export OPENRESTY_VERSION=source
-. ./.travis/linux_openresty_common_runner.sh
+. ./ci/linux_openresty_common_runner.sh
diff --git a/.travis/linux_tengine_runner.sh b/ci/linux_tengine_runner.sh
similarity index 99%
rename from .travis/linux_tengine_runner.sh
rename to ci/linux_tengine_runner.sh
index 217955d..e50afdf 100755
--- a/.travis/linux_tengine_runner.sh
+++ b/ci/linux_tengine_runner.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
before_install() {
sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit
1)
@@ -242,8 +242,8 @@ do_install() {
git clone https://github.com/iresty/test-nginx.git test-nginx
make utils
- git clone https://github.com/apache/openwhisk-utilities.git
.travis/openwhisk-utilities
- cp .travis/ASF* .travis/openwhisk-utilities/scancode/
+ git clone https://github.com/apache/openwhisk-utilities.git
ci/openwhisk-utilities
+ cp ci/ASF* ci/openwhisk-utilities/scancode/
ls -l ./
}
diff --git a/docs/en/latest/install-dependencies.md
b/docs/en/latest/install-dependencies.md
index 4f344aa..4f58fa7 100644
--- a/docs/en/latest/install-dependencies.md
+++ b/docs/en/latest/install-dependencies.md
@@ -34,7 +34,7 @@ title: Install Dependencies
- Now by default Apache APISIX uses HTTP protocol to talk with etcd cluster,
which is insecure. Please configure certificate and corresponding private key
for your etcd cluster, and use "https" scheme explicitly in the etcd endpoints
list in your Apache APISIX configuration, if you want to keep the data secure
and integral. See the etcd section in `conf/config-default.yaml` for more
details.
-- If you want use Tengine instead of OpenResty, please take a look at this
installation step script [Install Tengine at
Ubuntu](https://github.com/apache/apisix/blob/master/.travis/linux_tengine_runner.sh).
+- If you want use Tengine instead of OpenResty, please take a look at this
installation step script [Install Tengine at
Ubuntu](https://github.com/apache/apisix/blob/master/ci/linux_tengine_runner.sh).
- If it is OpenResty 1.19, APISIX will use OpenResty's built-in LuaJIT to run
`bin/apisix`; otherwise it will use Lua 5.1. If you encounter `luajit:
lj_asm_x86.h:2819: asm_loop_ fixup: Assertion '((intptr_t)target & 15) == 0'
failed`, this is a problem with the low version of OpenResty's built-in LuaJIT
under certain compilation conditions.
diff --git a/docs/zh/latest/install-dependencies.md
b/docs/zh/latest/install-dependencies.md
index 5fa765b..48ccad1 100644
--- a/docs/zh/latest/install-dependencies.md
+++ b/docs/zh/latest/install-dependencies.md
@@ -34,7 +34,7 @@ title: 安装依赖
- 目前 Apache APISIX 默认使用 HTTP 协议与 etcd 集群通信，这并不安全，如果希望保障数据的安全性和完整性。 请为您的 etcd
集群配置证书及对应私钥，并在您的 Apache APISIX etcd endpoints 配置列表中明确使用 `https` 协议前缀。请查阅
`conf/config-default.yaml` 中 etcd 一节相关的配置来了解更多细节。
-- 如果你要想使用 Tengine 替代 OpenResty，请参考 [Install Tengine at
Ubuntu](https://github.com/apache/apisix/blob/master/.travis/linux_tengine_runner.sh)。
+- 如果你要想使用 Tengine 替代 OpenResty，请参考 [Install Tengine at
Ubuntu](https://github.com/apache/apisix/blob/master/ci/linux_tengine_runner.sh)。
- 如果是 OpenResty 1.19，APISIX 会使用 OpenResty 内置的 LuaJIT 来运行 `bin/apisix`；否则会使用
Lua 5.1。如果运行过程中遇到 `luajit: lj_asm_x86.h:2819: asm_loop_fixup: Assertion
'((intptr_t)target & 15) == 0' failed`，这是低版本 OpenResty 内置的 LuaJIT 在特定编译条件下的问题。
diff --git a/t/node/healthcheck-ipv6.t b/t/node/healthcheck-ipv6.t
index b906966..99a8894 100644
--- a/t/node/healthcheck-ipv6.t
+++ b/t/node/healthcheck-ipv6.t
@@ -24,15 +24,7 @@ BEGIN {
}
}
-use t::APISIX;
-
-my $travis_os_name = $ENV{TRAVIS_OS_NAME};
-if ((defined $travis_os_name) && $travis_os_name eq "linux") {
- plan(skip_all =>
- "skip under Travis CI Linux environment which doesn't work well with
IPv6");
-} else {
- plan 'no_plan';
-}
+use t::APISIX 'no_plan';
master_on();
repeat_each(1);
diff --git a/t/node/remote-addr-ipv6.t b/t/node/remote-addr-ipv6.t
index 7f5d974..9345e59 100644
--- a/t/node/remote-addr-ipv6.t
+++ b/t/node/remote-addr-ipv6.t
@@ -14,18 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-use t::APISIX;
+use t::APISIX 'no_plan';
no_root_location();
-my $travis_os_name = $ENV{TRAVIS_OS_NAME};
-if ((defined $travis_os_name) && $travis_os_name eq "linux") {
- plan(skip_all =>
- "skip under Travis CI Linux environment which doesn't work well with
IPv6");
-} else {
- plan 'no_plan';
-}
-
run_tests();
__DATA__
diff --git a/t/node/upstream-ipv6.t b/t/node/upstream-ipv6.t
index f4b7875..51d2e8b 100644
--- a/t/node/upstream-ipv6.t
+++ b/t/node/upstream-ipv6.t
@@ -14,15 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-use t::APISIX;
-
-my $travis_os_name = $ENV{TRAVIS_OS_NAME};
-if ((defined $travis_os_name) && $travis_os_name eq "linux") {
- plan(skip_all =>
- "skip under Travis CI Linux environment which doesn't work well with
IPv6");
-} else {
- plan 'no_plan';
-}
+use t::APISIX 'no_plan';
repeat_each(1);
log_level('info');
diff --git a/utils/centos7-ci.sh b/utils/centos7-ci.sh
index db60fcf..32ec963 100755
--- a/utils/centos7-ci.sh
+++ b/utils/centos7-ci.sh
@@ -16,7 +16,7 @@
# limitations under the License.
#
-. ./.travis/common.sh
+. ./ci/common.sh
install_dependencies() {
export_or_prefix
