This is an automated email from the ASF dual-hosted git repository. spacewander pushed a commit to branch release/2.13 in repository https://gitbox.apache.org/repos/asf/apisix.git
commit 3d5fea47fbd976c03f4bd0d7384e0ad587032554 Author: tzssangglass <[email protected]> AuthorDate: Thu May 19 17:30:27 2022 +0800 chore(ci): apt update before install (#7080) Signed-off-by: spacewander <[email protected]> --- .github/workflows/build.yml | 9 ++++++--- .github/workflows/cli-master.yml | 3 --- .github/workflows/cli.yml | 3 --- .github/workflows/kubernetes-ci.yml | 3 +-- ci/common.sh | 5 +++++ ci/linux_apisix_current_luarocks_runner.sh | 2 ++ ci/linux_apisix_master_luarocks_runner.sh | 2 ++ ci/linux_openresty_common_runner.sh | 6 ++---- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef861c828..ba4318a2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,9 +79,6 @@ jobs: 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 libpcre3 libpcre3-dev libldap2-dev - - name: Build wasm code if: matrix.os_name == 'linux_openresty' run: | @@ -93,6 +90,12 @@ jobs: - name: Linux Before install run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install + - name: Start CI env + run: | + # launch deps env + make ci-env-up + sudo ./ci/linux-ci-init-service.sh + - name: Start Dubbo Backend if: matrix.os_name == 'linux_openresty' run: | diff --git a/.github/workflows/cli-master.yml b/.github/workflows/cli-master.yml index 506dc23e8..f804c5814 100644 --- a/.github/workflows/cli-master.yml +++ b/.github/workflows/cli-master.yml @@ -46,9 +46,6 @@ jobs: run: | project_compose_ci=ci/pod/docker-compose.common.yml make ci-env-up - - name: Linux Get dependencies - run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev - - name: Linux Install run: | sudo --preserve-env=OPENRESTY_VERSION \ diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 8d1576ce5..f4aff90e2 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -51,9 +51,6 @@ jobs: run: | project_compose_ci=ci/pod/docker-compose.common.yml make ci-env-up - - name: Linux Get dependencies - run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev - - name: Linux Before install run: sudo ./ci/${{ matrix.job_name }}_runner.sh before_install diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml index 40aa34fc3..210cc10df 100644 --- a/.github/workflows/kubernetes-ci.yml +++ b/.github/workflows/kubernetes-ci.yml @@ -81,8 +81,7 @@ jobs: - name: Linux Install run: | - sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev - sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1) + sudo ./ci/${{ matrix.os_name }}_runner.sh before_install sudo --preserve-env=OPENRESTY_VERSION ./ci/${{ matrix.os_name }}_runner.sh do_install - name: Run test cases diff --git a/ci/common.sh b/ci/common.sh index 6353957ec..fd5575c0f 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -80,3 +80,8 @@ install_nodejs () { } GRPC_SERVER_EXAMPLE_VER=20210819 + +linux_get_dependencies () { + apt update + apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev +} diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh index b630c1db9..3989d0df0 100755 --- a/ci/linux_apisix_current_luarocks_runner.sh +++ b/ci/linux_apisix_current_luarocks_runner.sh @@ -19,6 +19,8 @@ . ./ci/common.sh do_install() { + linux_get_dependencies + export_or_prefix ./utils/linux-install-openresty.sh diff --git a/ci/linux_apisix_master_luarocks_runner.sh b/ci/linux_apisix_master_luarocks_runner.sh index 75ca91eb2..2ffa94cde 100755 --- a/ci/linux_apisix_master_luarocks_runner.sh +++ b/ci/linux_apisix_master_luarocks_runner.sh @@ -19,6 +19,8 @@ . ./ci/common.sh do_install() { + linux_get_dependencies + export_or_prefix ./utils/linux-install-openresty.sh diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh index ad8dccb06..4a76c385a 100755 --- a/ci/linux_openresty_common_runner.sh +++ b/ci/linux_openresty_common_runner.sh @@ -19,11 +19,9 @@ . ./ci/common.sh before_install() { - sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1) + linux_get_dependencies - # launch deps env - make ci-env-up - ./ci/linux-ci-init-service.sh + sudo cpanm --notest Test::Nginx >build.log 2>&1 || (cat build.log && exit 1) } do_install() {
