GitHub: updated Android (Ubuntu) CI

corporateshark · Jan 13, 2025 · 9266d52 · 9266d52
1 parent 6969da5
commit 9266d52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up NDK
         uses: nttld/setup-ndk@v1.4.2
         with:
-          ndk-version: r26b
+          ndk-version: r27c
 
       - name: Set up JDK
         uses: actions/setup-java@v4
@@ -35,7 +35,11 @@ jobs:
         run: |
             sudo sed -i 's/azure\.//' /etc/apt/sources.list
             sudo apt-get update
-            sudo apt-get install -y cmake gcc-12 clang-15 xorg-dev libxinerama-dev libxcursor-dev libgles2-mesa-dev libegl1-mesa-dev libglfw3-dev libglew-dev libstdc++-12-dev extra-cmake-modules libxkbcommon-x11-dev wayland-protocols
+            sudo apt-get install -y gcc-12 clang-15 xorg-dev libxinerama-dev libxcursor-dev libgles2-mesa-dev libegl1-mesa-dev libglfw3-dev libglew-dev libstdc++-12-dev extra-cmake-modules libxkbcommon-x11-dev wayland-protocols
+            sudo apt remove cmake -y
+            sudo pip install cmake --upgrade
+            which make
+            cmake --version
 
       - name: Prepare Vulkan SDK
         uses: humbletim/setup-vulkan-sdk@v1.2.0

diff --git a/android/app/build.gradle.in b/android/app/build.gradle.in
@@ -42,7 +42,7 @@ android {
   externalNativeBuild {
     cmake {
       path file('../../../../CMakeLists.txt')
-      version '3.22.1'
+      version '3.31.4'
     }
   }
   buildFeatures {