This is an automated email from the ASF dual-hosted git repository.
spacewander 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 0866480e7 chore(ci): quietify the output of wget commands (#8737)
0866480e7 is described below
commit 0866480e751139ad4937349c1c5217f24308ea2a
Author: Abhishek Choudhary <[email protected]>
AuthorDate: Tue Feb 28 06:27:12 2023 +0530
chore(ci): quietify the output of wget commands (#8737)
---
.github/workflows/code-lint.yml | 2 +-
Makefile | 4 ++--
ci/centos7-ci.sh | 4 ++--
ci/common.sh | 8 ++++----
ci/init-plugin-test-service.sh | 2 +-
ci/linux-install-etcd-client.sh | 2 +-
ci/linux-install-openresty.sh | 2 +-
ci/performance_test.sh | 2 +-
ci/pod/openfunction/build-function-image.sh | 2 +-
utils/linux-install-luarocks.sh | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml
index c8303191b..07a1807f8 100644
--- a/.github/workflows/code-lint.yml
+++ b/.github/workflows/code-lint.yml
@@ -42,7 +42,7 @@ jobs:
- name: Shellcheck code
run: |
scversion="latest"
- wget -O-
"https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz";
| tar -xJv
+ wget -qO-
"https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz";
| tar -xJv
cp -av "shellcheck-${scversion}/shellcheck" /usr/local/bin/
shellcheck --version
git ls-files -- "*.sh" | xargs -t shellcheck
diff --git a/Makefile b/Makefile
index 385e8ed46..abe654407 100644
--- a/Makefile
+++ b/Makefile
@@ -172,11 +172,11 @@ undeps:
.PHONY: utils
utils:
ifeq ("$(wildcard utils/lj-releng)", "")
- wget -P utils
https://raw.githubusercontent.com/iresty/openresty-devel-utils/master/lj-releng
+ wget -qP utils
https://raw.githubusercontent.com/iresty/openresty-devel-utils/master/lj-releng
chmod a+x utils/lj-releng
endif
ifeq ("$(wildcard utils/reindex)", "")
- wget -P utils
https://raw.githubusercontent.com/iresty/openresty-devel-utils/master/reindex
+ wget -qP utils
https://raw.githubusercontent.com/iresty/openresty-devel-utils/master/reindex
chmod a+x utils/reindex
endif
diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh
index 8103503d3..5a0339064 100755
--- a/ci/centos7-ci.sh
+++ b/ci/centos7-ci.sh
@@ -26,7 +26,7 @@ install_dependencies() {
git sudo openldap-devel which
# curl with http2
- wget
https://github.com/moparisthebest/static-curl/releases/download/v7.79.1/curl-amd64
-O /usr/bin/curl
+ wget
https://github.com/moparisthebest/static-curl/releases/download/v7.79.1/curl-amd64
-qO /usr/bin/curl
# install openresty to make apisix's rpm test work
yum install -y yum-utils && yum-config-manager --add-repo
https://openresty.org/package/centos/openresty.repo
yum install -y openresty openresty-debug openresty-openssl111-debug-devel
pcre pcre-devel
@@ -47,7 +47,7 @@ install_dependencies() {
# add go1.15 binary to the path
mkdir build-cache
# centos-7 ci runs on a docker container with the centos image on top of
ubuntu host. Go is required inside the container.
- cd build-cache/ && wget https://golang.org/dl/go1.17.linux-amd64.tar.gz &&
tar -xf go1.17.linux-amd64.tar.gz
+ cd build-cache/ && wget -q https://golang.org/dl/go1.17.linux-amd64.tar.gz
&& tar -xf go1.17.linux-amd64.tar.gz
export PATH=$PATH:$(pwd)/go/bin
cd ..
# install and start grpc_server_example
diff --git a/ci/common.sh b/ci/common.sh
index 23602de64..769cc1305 100644
--- a/ci/common.sh
+++ b/ci/common.sh
@@ -59,7 +59,7 @@ rerun_flaky_tests() {
install_grpcurl () {
# For more versions, visit https://github.com/fullstorydev/grpcurl/releases
GRPCURL_VERSION="1.8.5"
- wget
https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz
+ wget -q
https://github.com/fullstorydev/grpcurl/releases/download/v${GRPCURL_VERSION}/grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz
tar -xvf grpcurl_${GRPCURL_VERSION}_linux_x86_64.tar.gz -C /usr/local/bin
}
@@ -67,14 +67,14 @@ install_vault_cli () {
VAULT_VERSION="1.9.0"
# the certificate can't be verified in CentOS7, see
#
https://blog.devgenius.io/lets-encrypt-change-affects-openssl-1-0-x-and-centos-7-49bd66016af3
- wget --no-check-certificate
https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
+ wget -q --no-check-certificate
https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip
unzip vault_${VAULT_VERSION}_linux_amd64.zip && mv ./vault /usr/local/bin
}
install_nodejs () {
NODEJS_PREFIX="/usr/local/node"
NODEJS_VERSION="16.13.1"
- wget
https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-x64.tar.xz
+ wget -q
https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-x64.tar.xz
tar -xvf node-v${NODEJS_VERSION}-linux-x64.tar.xz
rm -f /usr/local/bin/node
rm -f /usr/local/bin/npm
@@ -115,7 +115,7 @@ set_coredns() {
mkdir -p build-cache
if [ ! -f "build-cache/coredns_1_8_1" ]; then
- wget
https://github.com/coredns/coredns/releases/download/v1.8.1/coredns_1.8.1_linux_amd64.tgz
+ wget -q
https://github.com/coredns/coredns/releases/download/v1.8.1/coredns_1.8.1_linux_amd64.tgz
tar -xvf coredns_1.8.1_linux_amd64.tgz
mv coredns build-cache/
diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index 978b93543..881f466c7 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -48,7 +48,7 @@ after() {
before() {
# download keycloak cas provider
- sudo wget
https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar
-O /opt/keycloak-protocol-cas-18.0.2.jar
+ sudo wget -q
https://github.com/jacekkow/keycloak-protocol-cas/releases/download/18.0.2/keycloak-protocol-cas-18.0.2.jar
-O /opt/keycloak-protocol-cas-18.0.2.jar
}
case $1 in
diff --git a/ci/linux-install-etcd-client.sh b/ci/linux-install-etcd-client.sh
index f760b6f17..33e5b8a5e 100755
--- a/ci/linux-install-etcd-client.sh
+++ b/ci/linux-install-etcd-client.sh
@@ -25,7 +25,7 @@ if [[ $ARCH == "arm64" ]] || [[ $ARCH == "aarch64" ]]; then
ETCD_ARCH="arm64"
fi
-wget
https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}.tar.gz
+wget -q
https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}.tar.gz
tar xf etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}.tar.gz
sudo cp etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}/etcdctl /usr/local/bin/
rm -rf etcd-v${ETCD_VERSION}-linux-${ETCD_ARCH}
diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh
index 39f849d14..3bc2d18ab 100755
--- a/ci/linux-install-openresty.sh
+++ b/ci/linux-install-openresty.sh
@@ -68,7 +68,7 @@ if [ "$OPENRESTY_VERSION" == "source" ]; then
fi
cd ..
- wget
https://raw.githubusercontent.com/api7/apisix-build-tools/$abt_branch/build-apisix-base.sh
+ wget -q
https://raw.githubusercontent.com/api7/apisix-build-tools/$abt_branch/build-apisix-base.sh
chmod +x build-apisix-base.sh
./build-apisix-base.sh latest
diff --git a/ci/performance_test.sh b/ci/performance_test.sh
index 99a9e0c7d..94966b5d6 100755
--- a/ci/performance_test.sh
+++ b/ci/performance_test.sh
@@ -57,7 +57,7 @@ EOF
# install systemtap
cd /usr/local/
- wget http://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz
+ wget -q http://sourceware.org/systemtap/ftp/releases/systemtap-4.6.tar.gz
tar -zxf systemtap-4.6.tar.gz
mv systemtap-4.6 systemtap
cd systemtap
diff --git a/ci/pod/openfunction/build-function-image.sh
b/ci/pod/openfunction/build-function-image.sh
index 254fe1a1b..fc4a4945e 100755
--- a/ci/pod/openfunction/build-function-image.sh
+++ b/ci/pod/openfunction/build-function-image.sh
@@ -18,7 +18,7 @@
set -xeuo pipefail
if [ ! -f "./pack" ]; then
- wget
https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
+ wget -q
https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz
tar -zxvf pack-v0.27.0-linux.tgz
fi
diff --git a/utils/linux-install-luarocks.sh b/utils/linux-install-luarocks.sh
index 71c6ea2f0..b17a28076 100755
--- a/utils/linux-install-luarocks.sh
+++ b/utils/linux-install-luarocks.sh
@@ -23,7 +23,7 @@ if [ -z ${OPENRESTY_PREFIX} ]; then
fi
LUAROCKS_VER=3.8.0
-wget https://github.com/luarocks/luarocks/archive/v"$LUAROCKS_VER".tar.gz
+wget -q https://github.com/luarocks/luarocks/archive/v"$LUAROCKS_VER".tar.gz
tar -xf v"$LUAROCKS_VER".tar.gz
rm -f v"$LUAROCKS_VER".tar.gz
cd luarocks-"$LUAROCKS_VER" || exit
