diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index b38e939..4a8df81 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -25,14 +25,11 @@ jobs: with: submodules: 'recursive' - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' - - - name: Setup Android SDK - uses: android-actions/setup-android@v3 + java-version: '17' - name: Cache Gradle dependencies uses: actions/cache@v4 @@ -46,11 +43,14 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - - name: Install NDK + - name: Install NDK and CMake run: | - echo "y" | sdkmanager "ndk;25.2.9519653" - echo "y" | sdkmanager "cmake;3.22.1" + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;25.2.9519653" + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.22.1" - name: Build ConfigApp run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2328b4e..cd22b03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,14 +17,11 @@ jobs: with: submodules: 'recursive' - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' - - - name: Setup Android SDK - uses: android-actions/setup-android@v3 + java-version: '17' - name: Cache Gradle dependencies uses: actions/cache@v4 @@ -38,11 +35,14 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Setup Android SDK + uses: android-actions/setup-android@v3 - - name: Install NDK + - name: Install NDK and CMake run: | - echo "y" | sdkmanager "ndk;25.2.9519653" - echo "y" | sdkmanager "cmake;3.22.1" + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "ndk;25.2.9519653" + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.22.1" - name: Build ConfigApp run: |