Merge pull request #1083 from mwestphal/fix_android_ci

Fix android CI by updating Android NDK
f3d-app · Nov 30, 2023 · f249cc7 · f249cc7
2 parents 93ec6da + e849b10
commit f249cc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/android-ci/action.yml b/.github/actions/android-ci/action.yml
@@ -28,8 +28,8 @@ runs:
       working-directory: ${{github.workspace}}
       run: |
         apt-get install unzip
-        wget https://dl.google.com/android/repository/android-ndk-${{env.NDK_VERSION}}-linux-x86_64.zip
-        unzip -qq android-ndk-${{env.NDK_VERSION}}-linux-x86_64.zip
+        wget https://dl.google.com/android/repository/android-ndk-${{env.NDK_VERSION}}-linux.zip
+        unzip -qq android-ndk-${{env.NDK_VERSION}}-linux.zip
         mv android-ndk-${{env.NDK_VERSION}} android-ndk
 
     - name: Install VTK dependency

diff --git a/.github/actions/vtk_commit_sha b/.github/actions/vtk_commit_sha
@@ -1 +1 @@
-38137f80385c6835a8e482517e2d723b3a83a871
+f6dfd3ae6f6419a332f1c34b1ccecdbc2238f60b
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -347,7 +347,7 @@ jobs:
     container: ghcr.io/f3d-app/f3d-ci
 
     env:
-      NDK_VERSION: r21e
+      NDK_VERSION: r26b
       API_LEVEL: 27
 
     steps:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		38137f80385c6835a8e482517e2d723b3a83a871
		f6dfd3ae6f6419a332f1c34b1ccecdbc2238f60b