Skip to content
Snippets Groups Projects
Commit 5c89a8ec authored by Patrick José Pereira's avatar Patrick José Pereira
Browse files

github: android_*: Update to use latest Qt action


Signed-off-by: default avatarPatrick José Pereira <patrickelectric@gmail.com>
parent 07d8d591
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ jobs: ...@@ -38,7 +38,7 @@ jobs:
git fetch --all --tags -f git fetch --all --tags -f
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v3
with: with:
version: ${{ env.QT_VERSION }} version: ${{ env.QT_VERSION }}
host: linux host: linux
...@@ -47,6 +47,13 @@ jobs: ...@@ -47,6 +47,13 @@ jobs:
modules: qtcharts modules: qtcharts
setup-python: true setup-python: true
- name: Install Android NDK
uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Install ccache - name: Install ccache
run: sudo apt-get install ccache run: sudo apt-get install ccache
...@@ -98,6 +105,10 @@ jobs: ...@@ -98,6 +105,10 @@ jobs:
working-directory: ${{ runner.temp }}/shadow_build_dir working-directory: ${{ runner.temp }}/shadow_build_dir
env: env:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_LATEST_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
run: | run: |
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="armeabi-v7a" qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="armeabi-v7a"
make -j2 make -j2
......
...@@ -38,7 +38,7 @@ jobs: ...@@ -38,7 +38,7 @@ jobs:
git fetch --all --tags -f git fetch --all --tags -f
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v3
with: with:
version: ${{ env.QT_VERSION }} version: ${{ env.QT_VERSION }}
host: linux host: linux
...@@ -47,6 +47,13 @@ jobs: ...@@ -47,6 +47,13 @@ jobs:
modules: qtcharts modules: qtcharts
setup-python: true setup-python: true
- name: Install Android NDK
uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Install ccache - name: Install ccache
run: sudo apt-get install ccache run: sudo apt-get install ccache
...@@ -98,6 +105,10 @@ jobs: ...@@ -98,6 +105,10 @@ jobs:
working-directory: ${{ runner.temp }}/shadow_build_dir working-directory: ${{ runner.temp }}/shadow_build_dir
env: env:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_LATEST_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
run: | run: |
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="arm64-v8a" qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="arm64-v8a"
make -j2 make -j2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment