diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml index 938fdf80..c2e67014 100644 --- a/.github/workflows/builds_desktop.yml +++ b/.github/workflows/builds_desktop.yml @@ -62,6 +62,11 @@ jobs: # Deploy application - name: Deploy application run: | + sudo rm /home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64/plugins/position/libqtposition_nmea.so + sudo rm /home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64/plugins/sqldrivers/libqsqlmimer.so + sudo rm /home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64/plugins/sqldrivers/libqsqlmysql.so + sudo rm /home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64/plugins/sqldrivers/libqsqlodbc.so + sudo rm /home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64/plugins/sqldrivers/libqsqlpsql.so ./deploy_linux.sh -c -i -p # Upload application ZIP diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml index 33a9b99d..5c6dd8b0 100644 --- a/.github/workflows/builds_mobile.yml +++ b/.github/workflows/builds_mobile.yml @@ -45,9 +45,9 @@ jobs: # uses: android-actions/setup-android@v3 #- name: Install Android SDK / NDK / tools # run: | - # sdkmanager "platforms;android-34" - # sdkmanager "ndk;26.3.11579264" - # sdkmanager "build-tools;34.0.0" + # sdkmanager "platforms;android-35" + # sdkmanager "ndk;26.1.10909125" + # sdkmanager "build-tools;35.0.0" # Install Qt (desktop & Android) - name: Install Qt (desktop & Android) @@ -60,6 +60,11 @@ jobs: modules: qtconnectivity qtcharts qtpositioning extra: '--autodesktop' + # Install dependencies (from package manager) + - name: Install dependencies (from package manager) + run: | + sudo apt-get install ninja-build -y; + # Setup env - name: Setup env run: | @@ -108,7 +113,7 @@ jobs: # Install dependencies (from package manager) #- name: Install dependencies (from package manager) # run: | - # brew install cmake + # brew install cmake ninja # Setup env - name: Setup env @@ -128,5 +133,5 @@ jobs: -DQT_HOST_PATH:PATH=${{env.QT_HOST_PATH}} \ -DENABLE_ARC=FALSE \ -DPLATFORM=OS64 \ - -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" \ - cmake --build build/ --config Release + -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" + cmake --build build/ --config Release -- CODE_SIGNING_ALLOWED=NO diff --git a/assets/android/build.gradle b/assets/android/build.gradle index af924cde..1f6b5894 100644 --- a/assets/android/build.gradle +++ b/assets/android/build.gradle @@ -5,7 +5,6 @@ buildscript { } dependencies { - //classpath 'com.android.tools.build:gradle:8.6.1' // works with Qt 6.8+ // Java 17 classpath 'com.android.tools.build:gradle:8.2.2' // works with Qt 6.7+ // Java 17 } }