CI: Build Windows Arm64 CrossCompiled

mavlink · Jan 8, 2025 · 448f023 · 448f023
1 parent 4a1adfa
commit 448f023
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 42 deletions.
diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml
@@ -51,9 +51,7 @@ jobs:
 
       - uses: seanmiddleditch/gha-setup-ninja@v5
       - uses: lukka/get-cmake@latest
-
-      # - name: Set Up sccache
-      #   uses: mozilla-actions/[email protected]
+      - uses: mozilla-actions/[email protected]
 
       - name: Install Qt for Android
         uses: ./.github/actions/qt-android

diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         BuildType: [Release]
-        Arch: [x64] # Arm64
+        Arch: [x64]
 
     defaults:
       run:
@@ -74,8 +74,8 @@ jobs:
       # - name: Install Gstreamer
       #   run: choco install --no-progress gstreamer gstreamer-devel --version=${{ env.GST_VERSION }}
 
-      # - name: Set Up sccache
-      #   uses: mozilla-actions/[email protected].5
+      - name: Set Up sccache
+        uses: mozilla-actions/[email protected].7
 
       - name: Set Up Cache
         uses: hendrikmuhs/ccache-action@main
@@ -99,20 +99,6 @@ jobs:
           modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
           cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
 
-      - name: Install Qt for Windows (Arm64)
-        if: matrix.Arch == 'Arm64'
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: ${{ env.QT_VERSION }}
-          aqtversion: ==3.1.*
-          host: windows
-          target: desktop
-          arch: win64_msvc2022_arm64 # _cross_compiled
-          dir: ${{ runner.temp }}
-          extra: --autodesktop
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
-          cache: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-
       - name: Set up Visual Studio shell
         uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -122,24 +108,10 @@ jobs:
 
       - name: Configure
         working-directory: ${{ runner.temp }}\shadow_build_dir
-        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja ^
-              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }} ^
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build
         working-directory: ${{ runner.temp }}\shadow_build_dir
         run: cmake --build . --target all --config ${{ matrix.BuildType }}
-
-      # - name: Install
-      #   working-directory: ${{ runner.temp }}\shadow_build_dir
-      #   run: cmake --install . --config ${{ matrix.BuildType }}
-
-      # - name: Upload Build File
-      #   if: matrix.BuildType == 'Release'
-      #   uses: ./.github/actions/upload
-      #   with:
-      #     artifact_name: ${{ env.ARTIFACT }}
-      #     aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      #     aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      #     source: ''
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -88,7 +88,7 @@ jobs:
           save: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
           evict-old-files: 'job'
 
-      - name: Install Qt for Linux
+      - name: Install Qt for Linux (x64)
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         BuildType: [Release]
-        Arch: [x64] # Arm64
+        Arch: [x64, Arm64]
 
     defaults:
       run:
@@ -97,10 +97,10 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
-          aqtversion: ==3.1.*
+          aqtversion: ==3.1.19
           host: windows
           target: desktop
-          arch: win64_msvc2022_arm64 # _cross_compiled
+          arch: win64_msvc2022_arm64_cross_compiled
           dir: ${{ runner.temp }}
           extra: --autodesktop
           modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
@@ -115,8 +115,9 @@ jobs:
 
       - name: Configure
         working-directory: ${{ runner.temp }}\shadow_build_dir
-        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja ^
-              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }} ^
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
+              -DQT_HOST_PATH="${{ env.QT_ROOT_DIR }}/../msvc2022_64"
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
 
       - name: Build