From c6949cd09b6d8e7384e2dc2111fd95e7e507ace4 Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 15 Jun 2023 13:00:32 +0800 Subject: [PATCH] Update rustup before compile --- .github/workflows/ci.yml | 2 +- .github/workflows/pull_request.yml | 2 +- .github/workflows/releases.yml | 2 +- app/src/main/rust/src/lib.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01fb51b11..00ecc4266 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null - name: Install Rust Toolchain - run: rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - name: Ktlint Check run: ./gradlew ktlintCheck diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f5c41d2fb..b0f365b04 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,7 +23,7 @@ jobs: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null - name: Install Rust Toolchain - run: rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - name: Ktlint Check run: ./gradlew ktlintCheck diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 2b573b0f3..d5d3709d6 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -26,7 +26,7 @@ jobs: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.2.9519653" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null - name: Install Rust Toolchain - run: rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android + run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - name: Gradle Build uses: gradle/gradle-build-action@v2 diff --git a/app/src/main/rust/src/lib.rs b/app/src/main/rust/src/lib.rs index a419cacf5..182991607 100644 --- a/app/src/main/rust/src/lib.rs +++ b/app/src/main/rust/src/lib.rs @@ -71,7 +71,7 @@ where #[catch_panic(default = "std::ptr::null_mut()")] #[allow(non_snake_case)] #[jni_fn("com.hippo.ehviewer.client.parser.HomeParserKt")] -pub fn parseLimit(mut env: JNIEnv, _class: JClass, input: JString) -> jobject { +pub fn parseLimit(env: JNIEnv, _class: JClass, input: JString) -> jobject { let mut env = JnixEnv::from(env); let vec = parse_jni_string(&mut env, &input, |dom, parser, _env| { let iter = dom.query_selector("strong")?;