From 3f7ada6c71aa9a8ecd75550187c83498f1945092 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <pgriffis@igalia.com>
Date: Tue, 18 Aug 2026 15:35:05 -0500
Subject: [PATCH 1/2] flatpak: Bump WPE

---
 flatpak/com.igalia.wig.WPE.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flatpak/com.igalia.wig.WPE.yaml b/flatpak/com.igalia.wig.WPE.yaml
index 9a4fb30..36914ad 100644
--- a/flatpak/com.igalia.wig.WPE.yaml
+++ b/flatpak/com.igalia.wig.WPE.yaml
@@ -123,4 +123,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/WebKit/WebKit.git
-        commit: d1dca194fe699fe19361e216e2d5f29a2e5eec51
+        commit: 2b6e5de7ce664f52e9bfbfbd674a747d9ddc3ba6

From f15cb6137c3038d2368349818e4a40f7eb0d3fa9 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <pgriffis@igalia.com>
Date: Tue, 18 Aug 2026 15:34:19 -0500
Subject: [PATCH 2/2] flatpak: Build on arm

---
 .github/workflows/flatpak.yml | 44 ++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 9dc6967..adea3d6 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -34,7 +34,14 @@ jobs:
           echo "pages-url=https://$owner.github.io/${repository#*/}" >> "$GITHUB_OUTPUT"
 
   build-wpe-flatpak:
-    runs-on: [self-hosted, x64]
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            runner: [self-hosted, x64]
+          - arch: aarch64
+            runner: [self-hosted, arch-arm64]
+    runs-on: ${{ matrix.runner }}
     needs: check-wpe-inputs
     # Never run a fork's pull request on the self-hosted runner. Skipping this
     # is handled by build-wig-flatpak, which then builds against the published
@@ -61,21 +68,22 @@ jobs:
 
       - name: Create WPE bundle
         run: |
-          flatpak build-bundle _flatpak-repo wpe-base.flatpak \
+          flatpak build-bundle _flatpak-repo wpe-base-${{ matrix.arch }}.flatpak \
+            --arch=${{ matrix.arch }} \
             --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
             com.igalia.wig.WPE master
 
       - name: Upload WPE bundle
         uses: actions/upload-artifact@v4
         with:
-          name: wpe-base-x86_64.flatpak
-          path: wpe-base.flatpak
+          name: wpe-base-${{ matrix.arch }}.flatpak
+          path: wpe-base-${{ matrix.arch }}.flatpak
           if-no-files-found: error
 
       - name: Install WPE base app
         run: |
           flatpak install --user --noninteractive --assumeyes --reinstall \
-            --bundle wpe-base.flatpak
+            --bundle wpe-base-${{ matrix.arch }}.flatpak
 
       # - name: Build Clear Key module
       #   uses: flatpak/flatpak-github-actions/flatpak-builder@v6
@@ -85,7 +93,14 @@ jobs:
       #     cache: false
 
   build-wig-flatpak:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.runner }}
     container:
       image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-50
       options: --privileged
@@ -108,11 +123,13 @@ jobs:
         if: needs.build-wpe-flatpak.result == 'success'
         uses: actions/download-artifact@v4
         with:
-          name: wpe-base-x86_64.flatpak
+          name: wpe-base-${{ matrix.arch }}.flatpak
 
       - name: Install WPE base app
         if: needs.build-wpe-flatpak.result == 'success'
-        run: flatpak install --system --noninteractive --assumeyes --bundle wpe-base.flatpak
+        run: |
+          flatpak install --system --noninteractive --assumeyes \
+            --bundle wpe-base-${{ matrix.arch }}.flatpak
 
       - name: Install published WPE base app
         if: needs.build-wpe-flatpak.result == 'skipped'
@@ -126,8 +143,17 @@ jobs:
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           manifest-path: flatpak/com.igalia.wig.yaml
-          bundle: wig.flatpak
+          bundle: wig-${{ matrix.arch }}.flatpak
+          arch: ${{ matrix.arch }}
           cache: false
+          upload-artifact: false
+
+      - name: Upload Wig bundle
+        uses: actions/upload-artifact@v4
+        with:
+          name: wig-${{ matrix.arch }}.flatpak
+          path: wig-${{ matrix.arch }}.flatpak
+          if-no-files-found: error
 
   publish-flatpaks:
     runs-on: ubuntu-latest