tytan652 · tytan652 · Aug 31, 2023 · Aug 31, 2023 · Aug 30, 2023 · Aug 30, 2023
diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
@@ -14,6 +14,7 @@ jobs:
       notarize: ${{ steps.setup.outputs.notarize }}
       config: ${{ steps.setup.outputs.config }}
       commitHash: ${{ steps.setup.outputs.commitHash }}
+      flatpakArch: ${{ steps.setup.outputs.flatpakArch }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -28,25 +29,30 @@ jobs:
 
           case "${GITHUB_EVENT_NAME}" in
             pull_request)
-              config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
-              if gh pr view ${{ github.event.number }} --json labels \
+              config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo' 'flatpakArch:["x86_64"]')
+              label_data=$(gh pr view ${{ github.event.number }} --json labels)
+              if echo "${label_data}" \
                 | jq -e -r '.labels[] | select(.name == "Seeking Testers")' > /dev/null; then
                 config_data[0]='codesign:true'
                 config_data[2]='package:true'
               fi
+              if echo "${label_data}" \
+                | jq -e -r '.labels[] | select(.name == "Flatpak QEMU")' > /dev/null; then
+                config_data[5]='flatpakArch:["x86_64", "aarch64"]'
+              fi
               ;;
             push)
-              config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo')
+              config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo' 'flatpakArch:["x86_64", "aarch64"]')
               if [[ ${GITHUB_REF_NAME} =~ [0-9]+.[0-9]+.[0-9]+(-(rc|beta).+)? ]]; then
                 config_data[1]='notarize:true'
                 config_data[3]='config:Release'
               fi
               ;;
             workflow_dispatch)
-              config_data=('codesign:true' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
+              config_data=('codesign:true' 'notarize:false' 'package:false' 'config:RelWithDebInfo' 'flatpakArch:["x86_64", "aarch64"]')
               ;;
             schedule)
-              config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo')
+              config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo' 'flatpakArch:["x86_64", "aarch64"]')
               ;;
             *) ;;
           esac
@@ -243,79 +249,19 @@ jobs:
 
   flatpak-build:
     name: Flatpak 📦
-    runs-on: ubuntu-22.04
     needs: check-event
-    defaults:
-      run:
-        shell: bash
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
-      options: --privileged
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
-
-      - name: Set Up Environment 🔧
-        id: setup
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          : Set Up Environment 🔧
-          if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi
-
-          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
-
-          echo '::group::Install GitHub CLI tool'
-          dnf install -y -q gh
-          gh extension install actions/gh-actions-cache
-          echo '::endgroup::'
-
-          cache_key='flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}'
-          cache_ref='master'
-          read -r key size unit _ ref _ <<< \
-            "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-x86_64" | head -1)"
-
-          if [[ "${key}" ]]; then
-            echo "cacheHit=true" >> $GITHUB_OUTPUT
-          else
-            echo "cacheHit=false" >> $GITHUB_OUTPUT
-          fi
-
-          echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
-
-      - name: Validate Flatpak manifest
-        uses: ./.github/actions/flatpak-builder-lint
-        with:
-          artifact: manifest
-          path: build-aux/com.obsproject.Studio.json
-          validateToPublish: false
-
-      - name: Build Flatpak Manifest 🧾
-        uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
-        with:
-          build-bundle: ${{ fromJSON(needs.check-event.outputs.package) }}
-          bundle: obs-studio-flatpak-${{ needs.check-event.outputs.commitHash }}.flatpak
-          manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
-          cache: ${{ fromJSON(steps.setup.outputs.cacheHit) || (github.event_name == 'push' && github.ref_name == 'master')}}
-          restore-cache: ${{ fromJSON(steps.setup.outputs.cacheHit) }}
-          cache-key: ${{ steps.setup.outputs.cacheKey }}
-
-      - name: Validate build directory
-        uses: ./.github/actions/flatpak-builder-lint
-        with:
-          artifact: builddir
-          path: flatpak_app
-          validateToPublish: false
-
-      - name: Validate repository
-        uses: ./.github/actions/flatpak-builder-lint
-        with:
-          artifact: repo
-          path: repo
-          validateToPublish: false
+    uses: ./.github/workflows/flatpak-build.yaml
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: ${{ fromJson(needs.check-event.outputs.flatpakArch) }}
+    with:
+      build-bundle: ${{ fromJSON(needs.check-event.outputs.package) }}
+      bundle: obs-studio-flatpak-${{ needs.check-event.outputs.commitHash }}-${{ matrix.arch }}.flatpak
+      arch: ${{ matrix.arch }}
+    secrets: inherit
+    permissions:
+      contents: read
 
   windows-build:
     name: Windows 🪟

diff --git a/.github/workflows/flatpak-build.yaml b/.github/workflows/flatpak-build.yaml
@@ -0,0 +1,199 @@
+name: Flatpak Build
+on:
+  workflow_call:
+    inputs:
+      arch:
+        description: Architecture of the build
+        default: x86_64
+        type: string
+      build-bundle:
+        description: Build a bundle and upload it as an artifact
+        default: true
+        type: boolean
+      bundle:
+        description: Name of the bundle
+        default: obs-studio-flatpak.flatpak
+        type: string
+jobs:
+  build-until-90:
+    name: Build Modules Until 90-* 🧾
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        shell: bash
+    outputs:
+      cacheKey: ${{ steps.setup.outputs.cacheKey }}
+      cacheHit: ${{ steps.setup.outputs.cacheHit }}
+      qemuArch: ${{ steps.setup.outputs.qemuArch }}
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+      - name: Set Up Environment 🔧
+        id: setup
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          : Set Up Environment 🔧
+          if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi
+
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
+          echo '::group::Install GitHub CLI and jq tool'
+          dnf install -y -q gh jq
+          gh extension install actions/gh-actions-cache
+          echo '::endgroup::'
+
+          if [[ "${{ inputs.arch }}" != "x86_64" ]]; then
+            echo '::group::Install Docker'
+            dnf install -y -q docker
+            echo '::endgroup::'
+
+            if [[ "${{ inputs.arch }}" == "aarch64" ]]; then
+              echo "qemuArch=arm64" >> $GITHUB_OUTPUT
+            else
+              echo "qemuArch=${{ inputs.arch }}" >> $GITHUB_OUTPUT
+            fi
+          fi
+
+          stop_at_module=$(jq -r '.modules[:-1] | map(select(test("90-*")))[0]' build-aux/com.obsproject.Studio.json)
+          echo "stopAtModule=$(jq -r '.name' build-aux/$stop_at_module)" >> $GITHUB_OUTPUT
+
+          cache_key='flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}'
+          cache_ref='master'
+          read -r key size unit _ ref _ <<< \
+            "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-${{ inputs.arch }}" | head -1)"
+
+          if [[ "${key}" ]]; then
+            echo "cacheHit=true" >> $GITHUB_OUTPUT
+          else
+            echo "cacheHit=false" >> $GITHUB_OUTPUT
+          fi
+
+          echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
+
+      - name: Setup QEMU 🦤
+        if: ${{ (inputs.arch != 'x86_64') && !fromJSON(steps.setup.outputs.cacheHit) }}
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: ${{ steps.setup.outputs.qemuArch }}
+
+      - name: Validate Flatpak manifest
+        uses: ./.github/actions/flatpak-builder-lint
+        with:
+          artifact: manifest
+          path: build-aux/com.obsproject.Studio.json
+          validateToPublish: false
+
+      - name: Build Modules 🧱
+        if: ${{ !fromJSON(steps.setup.outputs.cacheHit) }}
+        uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+        with:
+          arch: ${{ inputs.arch }}
+          manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
+          stop-at-module: ${{ steps.setup.outputs.stopAtModule }}
+          cache: false
+
+      - name: Prepare Modules Artifact 🗜️
+        if: ${{ !fromJSON(steps.setup.outputs.cacheHit) }}
+        run: tar -cvf flatpak-build-until-90-${{ inputs.arch }}.tar .flatpak-builder
+
+      - name: Upload Modules Artifact 📡
+        if: ${{ !fromJSON(steps.setup.outputs.cacheHit) }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: flatpak-build-until-90-${{ inputs.arch }}
+          path: flatpak-build-until-90-${{ inputs.arch }}.tar
+          retention-days: 1
+
+  build-obs:
+    name: Build OBS Studio 🧾
+    runs-on: ubuntu-22.04
+    needs: build-until-90
+    defaults:
+      run:
+        shell: bash
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+      - name: Set Up Environment 🔧
+        id: setup
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          : Set Up Environment 🔧
+          if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi
+
+          git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
+          if [[ "${{ inputs.arch }}" != "x86_64" ]]; then
+            echo '::group::Install Docker'
+            dnf install -y -q docker
+            echo '::endgroup::'
+          fi
+
+      - name: Setup QEMU 🦤
+        if: ${{ (inputs.arch != 'x86_64') && !fromJSON(needs.build-until-90.outputs.cacheHit) }}
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: ${{ needs.build-until-90.outputs.qemuArch }}
+
+      - name: Download Modules Artifact 🛰️
+        if: ${{ !fromJSON(needs.build-until-90.outputs.cacheHit) }}
+        uses: actions/download-artifact@v3
+        with:
+          name: flatpak-build-until-90-${{ inputs.arch }}
+
+      - name: Extract Modules Artifact 🗜️
+        if: ${{ !fromJSON(needs.build-until-90.outputs.cacheHit) }}
+        run: tar -xvf flatpak-build-until-90-${{ inputs.arch }}.tar
+
+      - name: Build Modules 🧱
+        uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+        with:
+          arch: ${{ inputs.arch }}
+          build-bundle: ${{ fromJSON(inputs.build-bundle) }}
+          bundle: ${{ inputs.bundle }}
+          manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
+          cache: ${{ fromJSON(needs.build-until-90.outputs.cacheHit) || (github.event_name == 'push' && github.ref_name == 'master')}}
+          restore-cache: ${{ fromJSON(needs.build-until-90.outputs.cacheHit) }}
+          cache-key: ${{ needs.build-until-90.outputs.cacheKey }}
+
+      - name: Validate build directory
+        uses: ./.github/actions/flatpak-builder-lint
+        with:
+          artifact: builddir
+          path: flatpak_app
+          validateToPublish: false
+
+      - name: Validate repository
+        uses: ./.github/actions/flatpak-builder-lint
+        with:
+          artifact: repo
+          path: repo
+          validateToPublish: false
+
+  cleanup-artifact:
+    name: Cleanup Artifact 🧹
+    runs-on: ubuntu-22.04
+    needs: [build-until-90, build-obs]
+    if: ${{ !fromJSON(needs.build-until-90.outputs.cacheHit) }}
+    steps:
+      - name: Delete Modules Artifact 🗑️
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          useGlob: false
+          name: flatpak-build-until-90-${{ inputs.arch }}
diff --git a/build-aux/com.obsproject.Studio.json b/build-aux/com.obsproject.Studio.json
@@ -85,8 +85,7 @@
                 "-DENABLE_RTMPS=ON",
                 "-DENABLE_VLC=OFF",
                 "-DENABLE_AJA=ON",
-                "-DENABLE_LIBFDK=ON",
-                "-DENABLE_QSV11=ON"
+                "-DENABLE_LIBFDK=ON"
             ],
             "secret-opts": [
                 "-DRESTREAM_CLIENTID=$RESTREAM_CLIENTID",

diff --git a/build-aux/modules/50-intel-media-sdk.json b/build-aux/modules/50-intel-media-sdk.json
@@ -1,5 +1,8 @@
 {
     "name": "intel-media-sdk",
+    "only-arches": [
+        "x86_64"
+    ],
     "buildsystem": "cmake-ninja",
     "builddir": true,
     "config-opts": [

diff --git a/build-aux/modules/50-onevpl-intel-gpu.json b/build-aux/modules/50-onevpl-intel-gpu.json
@@ -1,5 +1,8 @@
 {
     "name": "onevpl-intel-gpu",
+    "only-arches": [
+        "x86_64"
+    ],
     "buildsystem": "cmake-ninja",
     "builddir": true,
     "config-opts": [

diff --git a/build-aux/modules/50-onevpl.json b/build-aux/modules/50-onevpl.json
@@ -1,5 +1,8 @@
 {
     "name": "onevpl",
+    "only-arches": [
+        "x86_64"
+    ],
     "buildsystem": "cmake-ninja",
     "builddir": true,
     "config-opts": [