From c1e4167d9fd49df123b20a671cdb68dcb0b3bb67 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Wed, 30 Dec 2020 16:52:14 +0800 Subject: [PATCH] Revert the rustup commands --- .circleci/config.yml | 4 +--- README.md | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac5530ad2a..23b2192d91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,11 +7,9 @@ jobs: environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: - - run: rustup toolchain install nightly-2020-12-17 - - run: rustup override set nightly-2020-12-17 - - run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - checkout - run: git submodule update --init --recursive + - run: cd core/src/main/rust/shadowsocks-rust && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - restore_cache: key: jars-{{ checksum "build.gradle.kts" }} - run: diff --git a/README.md b/README.md index 12e51f795a..a3ea7e628b 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,8 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc * Rust with Android targets installed ```bash - $ rustup toolchain install nightly-2020-12-20 - $ rustup override set nightly-2020-12-20 - $ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android + $ cd core/src/main/rust/shadowsocks-rust + $ rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android ``` ### BUILD