try to fix github actions

janbar · Feb 3, 2024 · 2cdcb5c · 2cdcb5c
1 parent af374b0
commit 2cdcb5c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/.github/workflows/build_android_arm64_ndk22.yml b/.github/workflows/build_android_arm64_ndk22.yml
@@ -13,17 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: zulu
+          java-version: 17
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Run sdkmanager update
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
-      - name: Install android platform, tools, ndk
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-29" "build-tools;28.0.3" "ndk;22.1.7171670"
+        uses: android-actions/setup-android@v3
+        with:
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt

diff --git a/.github/workflows/build_android_x64_ndk22.yml b/.github/workflows/build_android_x64_ndk22.yml
@@ -15,17 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: zulu
+          java-version: 17
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Run sdkmanager update
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
-      - name: Install android platform, tools, ndk
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-29" "build-tools;28.0.3" "ndk;22.1.7171670"
+        uses: android-actions/setup-android@v3
+        with:
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt

diff --git a/.github/workflows/build_android_x86_ndk22.yml b/.github/workflows/build_android_x86_ndk22.yml
@@ -13,17 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: zulu
+          java-version: 17
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Run sdkmanager update
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
-      - name: Install android platform, tools, ndk
-        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-29" "build-tools;28.0.3" "ndk;22.1.7171670"
+        uses: android-actions/setup-android@v3
+        with:
+          packages: "platform-tools platforms;android-29 build-tools;28.0.3 ndk;22.1.7171670"
       - name: Dump Android NDK
         run: "ls ${ANDROID_HOME}/ndk"
       - name: Cache Qt