From c90c78317705b0460bdaa6af8a50353bc8616335 Mon Sep 17 00:00:00 2001 From: funman300 Date: Thu, 14 May 2026 10:23:58 -0700 Subject: [PATCH] fix(ci): set ANDROID_HOME/NDK_HOME in workflow env block instead of GITHUB_ENV Co-Authored-By: Claude Sonnet 4.6 --- .gitea/workflows/android-build.yml | 9 +++------ .gitea/workflows/android-release.yml | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml index 8ea536c..b453ca8 100644 --- a/.gitea/workflows/android-build.yml +++ b/.gitea/workflows/android-build.yml @@ -13,6 +13,8 @@ on: env: ANDROID_SDK_ROOT: /opt/android-sdk + ANDROID_HOME: /opt/android-sdk + ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653 NDK_VERSION: "25.2.9519653" BUILD_TOOLS_VERSION: "34.0.0" @@ -59,12 +61,7 @@ jobs: "platforms;android-34" \ "ndk;$NDK_VERSION" - - name: Export Android environment - run: | - echo "ANDROID_HOME=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV" - echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/$NDK_VERSION" >> "$GITHUB_ENV" - - # ── Rust toolchain ───────────────────────────────────────────────── +# ── Rust toolchain ───────────────────────────────────────────────── - name: Install Rust stable run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \ diff --git a/.gitea/workflows/android-release.yml b/.gitea/workflows/android-release.yml index 2a53fc8..e8a1e3e 100644 --- a/.gitea/workflows/android-release.yml +++ b/.gitea/workflows/android-release.yml @@ -7,6 +7,8 @@ on: env: ANDROID_SDK_ROOT: /opt/android-sdk + ANDROID_HOME: /opt/android-sdk + ANDROID_NDK_HOME: /opt/android-sdk/ndk/25.2.9519653 NDK_VERSION: "25.2.9519653" BUILD_TOOLS_VERSION: "34.0.0" GITEA_API: https://git.aleshym.co/api/v1 @@ -56,12 +58,7 @@ jobs: "platforms;android-34" \ "ndk;$NDK_VERSION" - - name: Export Android environment - run: | - echo "ANDROID_HOME=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV" - echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/$NDK_VERSION" >> "$GITHUB_ENV" - - # ── Rust toolchain ───────────────────────────────────────────────── +# ── Rust toolchain ───────────────────────────────────────────────── - name: Install Rust stable run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \