From 0b2ae7c854205b84e6de6b4eab78ebaddfda9762 Mon Sep 17 00:00:00 2001
From: Ryo Nakano <ryonakaknock3@gmail.com>
Date: Mon, 14 Jul 2025 20:07:31 +0900
Subject: [PATCH] Actions: Add deploy

---
 .github/workflows/gettext.yml | 38 -----------------
 .github/workflows/merge.yml   | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/gettext.yml
 create mode 100644 .github/workflows/merge.yml

diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
deleted file mode 100644
index 6eca062..0000000
--- a/.github/workflows/gettext.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-
-name: Merge
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  gettext:
-    name: Gettext
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:8.2-x86_64
-      options: --privileged
-
-    steps:
-    - name: Install git, python3-git and jq
-      run: |
-        apt-get update
-        apt-get install git jq python3-git -y
-
-    - name: Clone repository
-      uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GIT_USER_TOKEN }}
-
-    - name: Configure Git
-      run: |
-        git config --global --add safe.directory "$GITHUB_WORKSPACE"
-    - name: Update Translation Files
-      uses: elementary/actions/gettext-flatpak@main
-      with:
-        manifest-path: 'io.elementary.maps.yml'
-      env:
-        GIT_USER_NAME: "elementaryBot"
-        GIT_USER_EMAIL: "builds@elementary.io"
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 0000000..5329218
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,78 @@
+---
+name: Merge
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy_flatpak:
+    name: Deploy Flatpak (${{ matrix.configuration.arch }})
+    runs-on: ${{ matrix.configuration.runs-on }}
+
+    strategy:
+      matrix:
+        configuration:
+          - arch: x86_64
+            runs-on: ubuntu-latest
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
+      # Don't fail the whole workflow if one architecture fails
+      fail-fast: false
+
+    container:
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
+      options: --privileged
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.5
+        with:
+          bundle: maps.flatpak
+          manifest-path: io.elementary.maps.yml
+          repository-name: appcenter
+          repository-url: https://flatpak.elementary.io/repo.flatpakrepo
+          cache-key: "flatpak-builder-${{ github.sha }}"
+          branch: daily
+          arch: ${{ matrix.configuration.arch }}
+
+      - name: Deploy
+        uses: flatpak/flatpak-github-actions/flat-manager@v6.5
+        with:
+          repository: appcenter
+          flat-manager-url: https://flatpak-api.elementary.io
+          token: ${{ secrets.FLAT_MANAGER_TOKEN }}
+
+  gettext:
+    name: Gettext
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/elementary/flatpak-platform/runtime:8.2-x86_64
+      options: --privileged
+
+    steps:
+    - name: Install git, python3-git and jq
+      run: |
+        apt-get update
+        apt-get install git jq python3-git -y
+
+    - name: Clone repository
+      uses: actions/checkout@v4
+      with:
+        token: ${{ secrets.GIT_USER_TOKEN }}
+
+    - name: Configure Git
+      run: |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+    - name: Update Translation Files
+      uses: elementary/actions/gettext-flatpak@main
+      with:
+        manifest-path: 'io.elementary.maps.yml'
+      env:
+        GIT_USER_NAME: "elementaryBot"
+        GIT_USER_EMAIL: "builds@elementary.io"