Fix compilation, maybe

Akaflieg-Freiburg · Nov 25, 2024 · 5881059 · 5881059
1 parent 0a4c43f
commit 5881059
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 26 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -3,6 +3,15 @@ name: Compile on Android
 on:
   push:
     branches: [ develop ]
+    paths-ignore:
+      - ".gitignore"
+      - "README.md"
+      - "CHANGELOG.md"
+      # ignore CI for other platforms
+      - ".github/workflows/ios.yml"
+      - ".github/workflows/linux.yml"
+      - ".github/workflows/macos.yml"
+      - ".github/workflows/windows.yml"
 
 jobs:
   build:
@@ -11,37 +20,32 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Install Qt for Desktop
-      uses: jurplel/install-qt-action@v4
-      with:
-        cache: 'true'
-        cache-key-prefix: 'install-qt-action-host'
-        version: '6.6.*'
-    - 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.6.*'
+        version: '6.8.0'
         arch: 'android_arm64_v8a'
-    - name: Install Additional Software
-      run: |
-        sudo apt install doxygen graphviz librsvg2-bin
-        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "platform-tools" "build-tools;33.0.2"
-        echo ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.1.8937393 >> $GITHUB_ENV
+    - 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: 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"
-        echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "ndk;25.1.8937393"
     - name: Configure
       run: |
+        export QT_HOST_PATH="$(readlink -f "$QT_ROOT_DIR/../gcc_64")"
         cmake -E make_directory build
         $QT_ROOT_DIR/bin/qt-cmake -DCMAKE_BUILD_TYPE:STRING=Debug -S . -B build
     - name: Compile

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -3,6 +3,15 @@ name: Compile on iOS-Simulator
 on:
   push:
     branches: [ develop ]
+    paths-ignore:
+      - ".gitignore"
+      - "README.md"
+      - "CHANGELOG.md"
+      # ignore CI for other platforms
+      - ".github/workflows/android.yml"
+      - ".github/workflows/linux.yml"
+      - ".github/workflows/macos.yml"
+      - ".github/workflows/windows.yml"
 
 env:
   APPLICATION: "addhoursandminutes"
@@ -12,15 +21,15 @@ jobs:
     runs-on: macos-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install Qt for Desktop
       uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
         cache-key-prefix: 'install-qt-action-macOS-host'
-        version: '6.7.*'
+        version: '6.8.*'
     - name: Set QT_HOST_PATH
       run: |
         echo QT_HOST_PATH=$QT_ROOT_DIR >> $GITHUB_ENV
@@ -30,7 +39,7 @@ jobs:
         cache: 'true'
         cache-key-prefix: 'install-qt-action-ios'
         target: 'ios'
-        version: '6.7.*'
+        version: '6.8.*'
     - name: Configure
       run: |
         cmake -E make_directory build

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -3,6 +3,15 @@ name: Compile on Linux
 on:
   push:
     branches: [ develop ]
+    paths-ignore:
+      - ".gitignore"
+      - "README.md"
+      - "CHANGELOG.md"
+      # ignore CI for other platforms
+      - ".github/workflows/android.yml"
+      - ".github/workflows/ios.yml"
+      - ".github/workflows/macos.yml"
+      - ".github/workflows/windows.yml"
 
 jobs:
   build:
@@ -18,7 +27,7 @@ jobs:
       uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
-        version: '6.7.1'
+        version: '6.8.*'
     - name: Install LinuxDeploy
       uses: miurahr/install-linuxdeploy-action@v1
       with:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -3,6 +3,16 @@ name: Compile on MacOS
 on:
   push:
     branches: [ develop ]
+    paths-ignore:
+      - ".gitignore"
+      - "README.md"
+      - "CHANGELOG.md"
+      # ignore CI for other platforms
+      - ".github/workflows/android.yml"
+      - ".github/workflows/ios.yml"
+      - ".github/workflows/linux.yml"
+      - ".github/workflows/windows.yml"
+
 
 jobs:
   build:
@@ -11,14 +21,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true 
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
-        version: '6.7.*'
+        version: '6.8.*'
     - name: Configure
       run: |
         cmake -E make_directory build

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,6 +3,15 @@ name: Compile on Windows
 on:
   push:
     branches: [ develop ]
+    paths-ignore:
+      - ".gitignore"
+      - "README.md"
+      - "CHANGELOG.md"
+      # ignore CI for other platforms
+      - ".github/workflows/android.yml"
+      - ".github/workflows/ios.yml"
+      - ".github/workflows/linux.yml"
+      - ".github/workflows/macos.yml"
 
 jobs:
   build:
@@ -11,14 +20,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true 
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
         cache: 'true'
-        version: '6.7.*'
+        version: '6.8.*'
     - name: Configure
       run: |
         cmake -E make_directory build