diff --git a/.gitea/workflows/compile.yaml b/.gitea/workflows/compile.yaml index c9a1deb..9342d37 100644 --- a/.gitea/workflows/compile.yaml +++ b/.gitea/workflows/compile.yaml @@ -43,23 +43,29 @@ jobs: - name: Install Android SDK & NDK run: | - mkdir -p $HOME/Android/Sdk/cmdline-tools - cd $HOME/Android/Sdk/cmdline-tools + ANDROID_SDK="$HOME/Android/Sdk" + mkdir -p "$ANDROID_SDK/cmdline-tools" + cd "$ANDROID_SDK/cmdline-tools" + + # Download and unzip command-line tools wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip - unzip cmdline-tools.zip - # Move extracted folder into 'latest' - if [ -d "tools" ]; then - mv tools latest - else - mv cmdline-tools latest - fi - yes | $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses - $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2" "ndk;25.2.9519653" + unzip -q cmdline-tools.zip + mv cmdline-tools latest || mv tools latest + + export ANDROID_SDK_ROOT="$ANDROID_SDK" + export PATH="$ANDROID_SDK/cmdline-tools/latest/bin:$ANDROID_SDK/platform-tools:$PATH" + + # Accept licenses non-interactively + yes | sdkmanager --licenses || true + + # Install SDK, build-tools, NDK, and platforms + sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2" "ndk;25.2.9519653" env: ANDROID_HOME: ${{ github.home }}/Android/Sdk ANDROID_SDK_ROOT: ${{ github.home }}/Android/Sdk + - name: Add Windows Rust target run: rustup target add x86_64-pc-windows-gnu