fix(ci): 💚 Fix android CI

alvr-org · Jan 10, 2024 · da30886 · da30886
1 parent 3b4249d
commit da30886
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -232,11 +232,14 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
+      - uses: android-actions/setup-android@v3
+        with:
+          packages: 'platforms;android-29'
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r26b
 
       - name: Build and package ALVR
         id: build

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -85,10 +85,17 @@ jobs:
           target: aarch64-linux-android
           override: true
       - uses: Swatinem/rust-cache@v1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - uses: android-actions/setup-android@v3
+        with:
+          packages: 'platforms;android-29'
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r26b
 
       - name: Install deps
         uses: actions-rs/cargo@v1

diff --git a/wiki/Building-From-Source.md b/wiki/Building-From-Source.md
@@ -184,7 +184,7 @@ For Debian, it requires to have the `non-free` repository to be enabled:
 * **Debian 12 / Ubuntu 22.10 / Pop!\_OS 22.10**
 
   ```bash
-  sudo apt install android-sdk-platform-tools-common sdkmanager google-android-ndk-r25b-installer
+  sudo apt install android-sdk-platform-tools-common sdkmanager google-android-ndk-r26b-installer
   ```
 
   ## 2. Setting environment variables