From c7e70fd6a3ca4fcdc8c97ea9071c6e89a74cb4d6 Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Sat, 19 Apr 2025 17:09:22 +0200
Subject: [PATCH] CI: Use Flatpak action upstream

The fork has been merge with upstream.

https://github.com/flathub-infra/flatpak-github-actions/issues/17
(cherry picked from commit a368f05d01982ed5f85681992cc12df3e6ef644d)
---
 .github/workflows/build-project.yaml | 2 +-
 .github/workflows/publish.yaml       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
index 17a7c345a..89de4454d 100644
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -292,7 +292,7 @@ jobs:
           path: build-aux/com.obsproject.Studio.json
 
       - name: Build Flatpak Manifest 🧾
-        uses: flathub-infra/flatpak-github-actions/flatpak-builder@42d281a5cf2ad1d0882a66af700a62cdad7686c6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
         with:
           build-bundle: ${{ fromJSON(needs.check-event.outputs.package) }}
           bundle: obs-studio-flatpak-${{ needs.check-event.outputs.commitHash }}.flatpak
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 9b1777e70..9e23f4bbc 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -107,7 +107,7 @@ jobs:
           path: build-aux/com.obsproject.Studio.json
 
       - name: Build Flatpak Manifest
-        uses: flathub-infra/flatpak-github-actions/flatpak-builder@42d281a5cf2ad1d0882a66af700a62cdad7686c6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
         with:
           build-bundle: false
           manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
@@ -142,7 +142,7 @@ jobs:
           path: repo
 
       - name: Publish to Flathub Beta
-        uses: flathub-infra/flatpak-github-actions/flat-manager@42d281a5cf2ad1d0882a66af700a62cdad7686c6
+        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
         if: ${{ matrix.branch == 'beta' }}
         with:
           flat-manager-url: https://hub.flathub.org/
@@ -151,7 +151,7 @@ jobs:
           build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
       - name: Publish to Flathub
-        uses: flathub-infra/flatpak-github-actions/flat-manager@42d281a5cf2ad1d0882a66af700a62cdad7686c6
+        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
         if: ${{ matrix.branch == 'stable' }}
         with:
           flat-manager-url: https://hub.flathub.org/