From c29b8871a3d11b52ccee9982e02476f5e9e11e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= <rafostar.github@gmail.com>
Date: Sat, 8 Feb 2025 15:48:00 +0100
Subject: [PATCH] workflows: Build natively on arm64

Replace QEMU with native arm64 runners, now that they are available
---
 .github/workflows/flatpak-nightly.yml | 36 +++++++++++++--------------
 .github/workflows/flatpak.yml         | 29 ++++++++++-----------
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml
index 1b828ac1..08e5175e 100644
--- a/.github/workflows/flatpak-nightly.yml
+++ b/.github/workflows/flatpak-nightly.yml
@@ -6,32 +6,32 @@ name: "Flatpak Nightly"
 jobs:
   flatpak:
     name: "Flatpak"
-    runs-on: ubuntu-latest
-    timeout-minutes: 600
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
-      options: --privileged
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
+        include:
+        - os: ubuntu-24.04
+          arch: x86_64
+        - os: ubuntu-24.04-arm
+          arch: aarch64
       fail-fast: false
+    runs-on: ${{ matrix.os }}
+    container:
+      image: registry.fedoraproject.org/fedora
+      options: --privileged
     steps:
+    - name: Prepare
+      run: |
+        dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
+        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
+        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
+        flatpak --system install -y --noninteractive flathub org.flatpak.Builder
     - name: Checkout
       uses: actions/checkout@v4
       with:
         submodules: recursive
-    - name: Install Docker
-      run: |
-        dnf -y install docker
-    - name: Setup QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-    - name: Prepare Runtime
-      run: |
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08
-        flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08
     - name: Build
       uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with:
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 5a92e3ca..36a8c2fc 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -10,28 +10,29 @@ name: "Flatpak"
 jobs:
   flatpak:
     name: "Flatpak"
-    runs-on: ubuntu-latest
-    timeout-minutes: 600
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-47
-      options: --privileged
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
+        include:
+        - os: ubuntu-24.04
+          arch: x86_64
+        - os: ubuntu-24.04-arm
+          arch: aarch64
       fail-fast: false
+    runs-on: ${{ matrix.os }}
+    container:
+      image: registry.fedoraproject.org/fedora
+      options: --privileged
     steps:
+    - name: Prepare
+      run: |
+        dnf install -y git git-lfs dbus-daemon flatpak flatpak-builder libappstream-glib ccache zstd xorg-x11-server-Xvfb
+        flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        flatpak --system install -y --noninteractive flathub org.flatpak.Builder
     - name: Checkout
       uses: actions/checkout@v4
       with:
         submodules: recursive
-    - name: Install Docker
-      run: |
-        dnf -y install docker
-    - name: Setup QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
     - name: Build
       uses: flatpak/flatpak-github-actions/flatpak-builder@master
       with: