diff --git a/Makefile b/Makefile index d30bd8ab976a..7588fd08303b 100644 --- a/Makefile +++ b/Makefile @@ -148,14 +148,6 @@ help: fi @echo -### check-rust : check if Rust is installed in the environment -.PHONY: check-rust -check-rust: - @if ! [ $(shell command -v rustc) ]; then \ - echo "ERROR: Rust is not installed. Please install Rust before continuing." >&2; \ - exit 1; \ - fi; - ### deps : Installing dependencies .PHONY: deps diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh index 41758ca62c59..cf2d0387bbc2 100755 --- a/ci/centos7-ci.sh +++ b/ci/centos7-ci.sh @@ -73,9 +73,6 @@ install_dependencies() { # install nodejs install_nodejs - # install rust - install_rust - # grpc-web server && client cd t/plugin/grpc-web ./setup.sh diff --git a/ci/common.sh b/ci/common.sh index 2840b7d8a711..e1961fc6b01e 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -100,14 +100,6 @@ install_nodejs () { npm config set registry https://registry.npmjs.org/ } -install_rust () { - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo sh -s -- -y - source "$HOME/.cargo/env" - # 1.69.0 version required to compile lua-resty-ldap - rustup install 1.69.0 - rustup default 1.69.0 -} - set_coredns() { # test a domain name is configured as upstream echo "127.0.0.1 test.com" | sudo tee -a /etc/hosts diff --git a/ci/linux_apisix_current_luarocks_runner.sh b/ci/linux_apisix_current_luarocks_runner.sh index a8836f43b691..96aac508f762 100755 --- a/ci/linux_apisix_current_luarocks_runner.sh +++ b/ci/linux_apisix_current_luarocks_runner.sh @@ -34,9 +34,6 @@ script() { sudo rm -rf /usr/local/share/lua/5.1/apisix - # install rust - install_rust - # install APISIX with local version luarocks install rockspec/apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1) luarocks make rockspec/apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1) diff --git a/ci/linux_apisix_master_luarocks_runner.sh b/ci/linux_apisix_master_luarocks_runner.sh index 3e99baf34116..afc487ddd160 100755 --- a/ci/linux_apisix_master_luarocks_runner.sh +++ b/ci/linux_apisix_master_luarocks_runner.sh @@ -38,9 +38,6 @@ script() { mkdir tmp && cd tmp cp -r ../utils ./ - # install rust - install_rust - # install APISIX by luarocks luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1) cp ../bin/apisix /usr/local/bin/apisix diff --git a/ci/linux_openresty_common_runner.sh b/ci/linux_openresty_common_runner.sh index 743dfac7d980..e4ed00905c86 100755 --- a/ci/linux_openresty_common_runner.sh +++ b/ci/linux_openresty_common_runner.sh @@ -33,9 +33,6 @@ do_install() { ./ci/linux-install-etcd-client.sh - # install rust - install_rust - create_lua_deps # sudo apt-get install tree -y diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh index 4b55cc7e620e..18fed3208290 100755 --- a/ci/redhat-ci.sh +++ b/ci/redhat-ci.sh @@ -73,9 +73,6 @@ install_dependencies() { # install nodejs install_nodejs - # install rust - install_rust - # grpc-web server && client pushd t/plugin/grpc-web ./setup.sh diff --git a/docs/en/latest/building-apisix.md b/docs/en/latest/building-apisix.md index 01d4ac331240..20f9273b9469 100644 --- a/docs/en/latest/building-apisix.md +++ b/docs/en/latest/building-apisix.md @@ -63,7 +63,7 @@ git clone --depth 1 --branch ${APISIX_VERSION} https://github.com/apache/apisix. Alternatively, you can also download the source package from the [Downloads](https://apisix.apache.org/downloads/) page. Note that source packages here are not distributed with test cases. -Next, navigate to the directory, install dependencies, and build APISIX. You should have [Rust](https://www.rust-lang.org) installed in your environment first before running `make deps`: +Next, navigate to the directory, install dependencies, and build APISIX. ```shell cd apisix-${APISIX_VERSION} diff --git a/t/chaos/utils/Dockerfile b/t/chaos/utils/Dockerfile index f2e119f02f6d..5d5ba6dac932 100644 --- a/t/chaos/utils/Dockerfile +++ b/t/chaos/utils/Dockerfile @@ -36,11 +36,6 @@ RUN set -x \ sudo \ && cd apisix \ && git config --global url.https://github.com/.insteadOf git://github.com/ \ - && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo sh -s -- -y \ - && source "$HOME/.cargo/env" \ - && export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \ - # next line is for rust cdylib compile on musl - && export RUSTFLAGS="-C target-feature=-crt-static" \ && make deps \ && cp -v bin/apisix /usr/bin/ \ && mv ../apisix /usr/local/apisix \ diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 220407808985..85cfa7483081 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -30,11 +30,6 @@ function detect_aur_helper() { fi } -function install_rust() { - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo sh -s -- -y - source "$HOME/.cargo/env" -} - function install_dependencies_with_aur() { detect_aur_helper $AUR_HELPER -S openresty --noconfirm @@ -68,8 +63,6 @@ function install_dependencies_with_yum() { # shellcheck disable=SC2086 sudo yum install -y openresty $common_dep fi - - install_rust } # Install dependencies on ubuntu and debian @@ -92,8 +85,6 @@ function install_dependencies_with_apt() { # install OpenResty and some compilation tools sudo apt-get install -y git openresty curl openresty-openssl111-dev make gcc libpcre3 libpcre3-dev libldap2-dev unzip - - install_rust } # Install dependencies on mac osx