1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00

Switched CI builds to Qt 6.4

This commit is contained in:
Martin Tůma 2022-10-08 15:38:36 +02:00
parent 26d2bc4f5d
commit 7bc5021989
2 changed files with 5 additions and 5 deletions

View File

@ -11,7 +11,7 @@ environment:
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
matrix: matrix:
- QTDIR: C:\Qt\5.15\msvc2019_64 - QTDIR: C:\Qt\5.15\msvc2019_64
- QTDIR: C:\Qt\6.3\msvc2019_64 - QTDIR: C:\Qt\6.4\msvc2019_64
NSISDEF: /DQT6 NSISDEF: /DQT6
install: install:

View File

@ -22,19 +22,19 @@ jobs:
- name: Run sdkmanager update - name: Run sdkmanager update
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- name: Install android platform, platform-tools, build-tools and ndk - name: Install android platform, platform-tools, build-tools and ndk
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670" run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;23.1.7779620"
- name: Setup NDK path - name: Setup NDK path
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
- name: Install Qt (Desktop) - name: Install Qt (Desktop)
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
aqtversion: '==2.1.0' aqtversion: '==2.1.0'
version: '6.3.1' version: '6.4.0'
- name: Install Qt (Android) - name: Install Qt (Android)
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
aqtversion: '==2.1.0' aqtversion: '==2.1.0'
version: '6.3.1' version: '6.4.0'
target: 'android' target: 'android'
arch: 'android_armv7' arch: 'android_armv7'
modules: qtpositioning qt5compat modules: qtpositioning qt5compat