Skip to content

Commit 9bcf5ba

Browse files
committed
try to fix github actions
1 parent ab916eb commit 9bcf5ba

2 files changed

Lines changed: 36 additions & 24 deletions

File tree

.github/workflows/build-android-ndk18.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
17-
- name: set up JDK 1.8
18-
uses: actions/setup-java@v1
16+
uses: actions/checkout@v3
17+
18+
- name: Install Java JDK for Android SDK tools
19+
uses: actions/setup-java@v3
1920
with:
20-
java-version: 1.8
21-
- name: Setup Android SDK
22-
uses: android-actions/setup-android@v2
23-
- name: Run sdkmanager update
24-
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
25-
- name: Install android platform, tools, ndk
26-
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-24" "build-tools;29.0.2" "ndk;18.1.5063045"
21+
distribution: zulu
22+
java-version: 17
23+
- name: Setup Android SDK tools
24+
uses: android-actions/setup-android@v3
25+
with:
26+
packages: "platform-tools platforms;android-24 build-tools;21.0.0 ndk;18.1.5063045"
2727
- name: Dump Android NDK
2828
run: "ls ${ANDROID_HOME}/ndk"
29+
30+
- name: Install Java JDK for Android Qt build
31+
uses: actions/setup-java@v1
32+
with:
33+
java-version: 1.8
2934
- name: Cache Qt
3035
id: cache-qt
3136
uses: actions/cache@v1
@@ -44,7 +49,8 @@ jobs:
4449
cached: ${{ steps.cache-qt.outputs.cache-hit }}
4550
- name: Dump Qt DIR
4651
run: echo ${Qt5_DIR}
47-
- name: Init submodules
52+
53+
- name: Fetch submodules
4854
run: git submodule init && git submodule update
4955
- name: Configure manifest
5056
run: cp android/AndroidManifest.xml.in.ndk18 android/AndroidManifest.xml.in
@@ -61,11 +67,11 @@ jobs:
6167
-DANDROID_SDK_TARGET=26
6268
-DANDROID_NATIVE_API_LEVEL=16
6369
-DQT_ANDROID_PLATFORM_LEVEL=16
70+
-DQT_ANDROID_SDK_BUILDTOOLS_REVISION=21.0.0
6471
-DQT_ANDROID_TOOL_PREFIX=aarch64-linux-android
6572
-DQT_ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
6673
-DQT_ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/18.1.5063045
6774
-DQT_ANDROID_QT_ROOT=${Qt5_DIR}
68-
-DQT_ANDROID_SDK_BUILDTOOLS_REVISION=21.0.0
6975
-DQt5_DIR=${Qt5_DIR}/lib/cmake/Qt5
7076
-DQt5Core_DIR=${Qt5_DIR}/lib/cmake/Qt5Core
7177
-DQt5Gui_DIR=${Qt5_DIR}/lib/cmake/Qt5Gui

.github/workflows/build-android-ndk21.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
17-
- name: set up JDK 11
18-
uses: actions/setup-java@v1
16+
uses: actions/checkout@v3
17+
18+
- name: Install Java JDK for Android SDK tools
19+
uses: actions/setup-java@v3
20+
with:
21+
distribution: zulu
22+
java-version: 17
23+
- name: Setup Android SDK tools
24+
uses: android-actions/setup-android@v3
1925
with:
20-
java-version: 11
21-
- name: Setup Android SDK
22-
uses: android-actions/setup-android@v2
23-
- name: Run sdkmanager update
24-
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
25-
- name: Install android platform, tools, ndk
26-
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "platform-tools" "platforms;android-24" "build-tools;29.0.2" "ndk;21.4.7075529"
26+
packages: "platform-tools platforms;android-24 build-tools;21.0.0 ndk;21.4.7075529"
2727
- name: Dump Android NDK
2828
run: "ls ${ANDROID_HOME}/ndk"
29+
30+
- name: Install Java JDK for Android Qt build
31+
uses: actions/setup-java@v1
32+
with:
33+
java-version: 1.8
2934
- name: Cache Qt
3035
id: cache-qt
3136
uses: actions/cache@v1
@@ -43,7 +48,8 @@ jobs:
4348
cached: ${{ steps.cache-qt.outputs.cache-hit }}
4449
- name: Dump Qt DIR
4550
run: echo ${Qt5_DIR}
46-
- name: Init submodules
51+
52+
- name: Fetch submodules
4753
run: git submodule init && git submodule update
4854
- name: Configure manifest
4955
run: cp android/AndroidManifest.xml.in.ndk21 android/AndroidManifest.xml.in
@@ -60,11 +66,11 @@ jobs:
6066
-DANDROID_SDK_TARGET=26
6167
-DANDROID_NATIVE_API_LEVEL=24
6268
-DQT_ANDROID_PLATFORM_LEVEL=24
69+
-DQT_ANDROID_SDK_BUILDTOOLS_REVISION=21.0.0
6370
-DQT_ANDROID_TOOL_PREFIX=aarch64-linux-android
6471
-DQT_ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
6572
-DQT_ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/21.4.7075529
6673
-DQT_ANDROID_QT_ROOT=${Qt5_DIR}
67-
-DQT_ANDROID_SDK_BUILDTOOLS_REVISION=21.0.0
6874
-DQt5_DIR=${Qt5_DIR}/lib/cmake/Qt5
6975
-DQt5Core_DIR=${Qt5_DIR}/lib/cmake/Qt5Core
7076
-DQt5Gui_DIR=${Qt5_DIR}/lib/cmake/Qt5Gui

0 commit comments

Comments
 (0)