Update actions

Akaflieg-Freiburg · Oct 9, 2024 · 3de932d · 3de932d
1 parent d6260c2
commit 3de932d
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -30,34 +30,38 @@ jobs:
         path: enrouteDependencies
         repository: Akaflieg-Freiburg/enrouteDependencies
         submodules: recursive
-    - name: Install Qt for Desktop
-      uses: jurplel/install-qt-action@v4
-      with:
-        version: '6.7.*'
-        modules: 'qtshadertools'	
-    - name: Set QT_HOST_PATH
-      run: |
-        echo QT_HOST_PATH=$QT_ROOT_DIR >> $GITHUB_ENV
-    - name: Install Qt for Android
+    - name: Install Qt for Android arm64
       uses: jurplel/install-qt-action@v4
       with:
+        aqtversion: ==3.1.*
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-android'
+        modules: 'qt5compat qtconnectivity qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtsensors qtserialport qtshadertools qtspeech qtwebsockets qtwebview'
         target: 'android'
-        version: '6.7.*'
+        version: '6.7.3'
         arch: 'android_arm64_v8a'
-        modules: 'qt5compat qtconnectivity qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtsensors qtserialport qtshadertools qtspeech qtwebsockets qtwebview'
+    - name: Set up OpenJDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: adopt
+        java-version: 17
+    - name: Setup ninja
+      uses: seanmiddleditch/gha-setup-ninja@v5
     - name: Install Additional Software
       run: |
-        sudo apt install extra-cmake-modules ninja-build spirv-tools
-        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-31" "platform-tools" "build-tools;31.0.0"
-        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext5" "platforms;android-33-ext4"
-        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;23.1.7779620"
-        echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/23.1.7779620 >> $GITHUB_ENV
+        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" "platform-tools" "build-tools;34.0.0"
+        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;26.1.10909125"
+        echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/26.1.10909125 >> $GITHUB_ENV
+    - name: Remove Unwanted Software
+      run: |
+        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext4" "platforms;android-33-ext5" "platforms;android-34-ext8"
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         key: android
     - name: Compile and Install libzip
       run: |
+        export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")"
         $QT_ROOT_DIR/bin/qt-cmake \
           -S enrouteDependencies/libzip \
           -B build-libzip \
@@ -75,6 +79,7 @@ jobs:
         cmake --install build-libzip
     - name: Compile and Install maplibre-native-qt
       run: |
+        export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")"
         $QT_ROOT_DIR/bin/qt-cmake \
           -S enrouteDependencies/maplibre-native-qt \
           -B build-maplibre-native-qt \
@@ -88,6 +93,7 @@ jobs:
         cmake --install build-maplibre-native-qt
     - name: Compile Enroute
       run: |
+        export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")"
         $QT_ROOT_DIR/bin/qt-cmake \
           -S enroute \
           -B build-enroute\