Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove Rust related scripts and doc update #10121

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/centos7-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/linux_apisix_current_luarocks_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions ci/linux_apisix_master_luarocks_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/linux_openresty_common_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions ci/redhat-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/building-apisix.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 0 additions & 5 deletions t/chaos/utils/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 0 additions & 9 deletions utils/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading