Bring back Android SDK setup

ARK-Builders · Dec 12, 2024 · 68f478f · 68f478f
1 parent 6730418
commit 68f478f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,17 +56,18 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Set up Android NDK
-        id: setup-ndk
         uses: nttld/setup-ndk@v1
         with:
+          link-to-sdk: true
           ndk-version: r28-beta1
 
       - name: Java tests
         run: gradle test
         working-directory: ./java
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
   windows:
     name: Test on Windows
@@ -101,17 +102,18 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Set up Android NDK
-        id: setup-ndk
         uses: nttld/setup-ndk@v1
         with:
+          link-to-sdk: true
           ndk-version: r28-beta1
 
       - name: Java tests
         run: gradle test
         working-directory: ./java
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
   mac-intel:
     name: Test on macOS Intel
@@ -146,14 +148,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
 
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Set up Android NDK
-        id: setup-ndk
         uses: nttld/setup-ndk@v1
         with:
+          link-to-sdk: true
           ndk-version: r28-beta1
 
       - name: Java tests
         run: gradle test
         working-directory: ./java
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}