From 9ed75a4736e4c73b8af0ce20d47d5a753a606080 Mon Sep 17 00:00:00 2001 From: sstone Date: Fri, 12 Jan 2024 11:42:04 +0100 Subject: [PATCH] Update github action scripts --- .github/workflows/release.yml | 6 +----- .github/workflows/snapshot.yml | 6 +----- .github/workflows/test.yml | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 086b9f3..9847fe6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,15 +58,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index daf2582..f6ba47d 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -67,15 +67,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e06cf05..fc3a042 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,15 +73,11 @@ jobs: base-devel autotools mingw-w64-x86_64-gcc - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - name: Setup Android if: matrix.os != 'windows-latest' shell: bash run: | - $ANDROID_HOME/tools/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" - name: Setup Android if: matrix.os == 'windows-latest' shell: msys2 {0}