CI: Update for Windows arm64 builds

obsproject · May 29, 2024 · 0a67bb1 · 0a67bb1
1 parent ddb4239
commit 0a67bb1
Showing 1 changed file with 52 additions and 4 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -444,7 +444,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target: [x64, x86, arm64]
+        target: [x64, x86]
         include:
           - target: x64
             config: Release
@@ -539,7 +539,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target: [x64, arm64, x86]
+        target: [x64, x86]
         config: [RelWithDebInfo, Debug]
 
     steps:
@@ -562,6 +562,54 @@ jobs:
           target: ${{ matrix.target }}
           config: ${{ matrix.config }}
 
+      - name: Publish Build Artifacts
+        if: matrix.target == 'x64' || (github.event_name != 'pull_request' || fromJSON(needs.pre-checks.outputs.seekingTesters))
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.setup.outputs.artifactName }}
+          path: ${{ github.workspace }}/windows/${{ steps.setup.outputs.artifactFileName }}
+
+  windows-qt6-arm64-build:
+    name: Build Qt6 (Windows ARM64)
+    runs-on: windows-2022
+    needs: [pre-checks, windows-qt6-build]
+    strategy:
+      fail-fast: true
+      matrix:
+        config: [RelWithDebInfo, Debug]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Environment
+        id: setup
+        run: |
+          # Setup Environment
+          $HostArtifactName="qt6-windows-x64-${{ matrix.config }}-${{ needs.pre-checks.outputs.shortHash }}"
+
+          $ArtifactName="qt6-windows-arm64-${{ matrix.config }}-${{ needs.pre-checks.outputs.shortHash }}"
+          $FileName="windows-deps-qt6-$(Get-Date -Format 'yyyy-MM-dd')-arm64-${{ matrix.config }}.zip"
+
+          "hostArtifactName=${HostArtifactName}" >> $env:GITHUB_OUTPUT
+          "qtHostPath=${env:GITHUB_WORKSPACE}/Qt6Host" >> $env:GITHUB_OUTPUT
+          "artifactName=${ArtifactName}" >> $env:GITHUB_OUTPUT
+          "artifactFileName=${FileName}" >> $env:GITHUB_OUTPUT
+
+      - name: Download Host Tools Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ steps.setup.outputs.hostArtifactName }}
+          path: ${{ github.workspace }}/Qt6Host
+
+      - name: Build Windows Qt
+        uses: ./.github/actions/build-qt
+        env:
+          QtHostPath: ${{ steps.setup.outputs.qtHostPath }}
+        with:
+          target: arm64
+          config: ${{ matrix.config }}
+
       - name: Publish Build Artifacts
         if: github.event_name != 'pull_request' || fromJSON(needs.pre-checks.outputs.seekingTesters)
         uses: actions/upload-artifact@v4
@@ -575,8 +623,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        target: [x64, arm64, x86]
-    needs: [pre-checks, windows-qt6-build]
+        target: [x64, x86, arm64]
+    needs: [pre-checks, windows-qt6-build, windows-qt6-arm64-build]
     steps:
       - name: Checkout
         uses: actions/checkout@v4