From 6abea551b5a945aec6cd149412975f4b85eadd2b Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 10 Jul 2024 15:14:03 +1000
Subject: [PATCH] CI/Flatpak: Use flathub container again

---
 .github/workflows/rolling-release.yml | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index 70f0782b6..87b4d34b3 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -268,7 +268,7 @@ jobs:
   linux-flatpak-build:
     runs-on: ubuntu-22.04
     container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.7
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
       options: --privileged
     timeout-minutes: 120
     steps:
@@ -291,14 +291,14 @@ jobs:
         scripts/generate-metainfo.sh scripts/flatpak
         cat scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
 
-    #- name: Validate AppStream XML
-    #  run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
+    - name: Validate AppStream XML
+      run: flatpak-builder-lint appstream scripts/flatpak/org.duckstation.DuckStation.metainfo.xml
 
-    #- name: Validate manifest
-    #  run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json
+    - name: Validate manifest
+      run: flatpak-builder-lint manifest scripts/flatpak/org.duckstation.DuckStation.json
 
     - name: Build Flatpak
-      uses: flatpak/flatpak-github-actions/flatpak-builder@d6ddccb268e43e87b19ca0112b83de26fb83b215
+      uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
       with:
         bundle: duckstation-x64.flatpak
         upload-artifact: false
@@ -306,24 +306,24 @@ jobs:
         arch: x86_64
         build-bundle: true
         verbose: true
-        #mirror-screenshots-url: https://dl.flathub.org/media
+        mirror-screenshots-url: https://dl.flathub.org/media
         branch: stable
         cache: true
         restore-cache: true
         cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }}
 
-    #- name: Push to Flathub stable
-    #  if: github.ref == 'refs/heads/dev'
-    #  uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
-    #  with:
-    #    flat-manager-url: https://hub.flathub.org/
-    #    repository: stable
-    #    token: ${{ secrets.FLATHUB_STABLE_TOKEN }}
-    #    build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+    - name: Push to Flathub stable
+      if: github.ref == 'refs/heads/dev'
+      uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+      with:
+        flat-manager-url: https://hub.flathub.org/
+        repository: stable
+        token: ${{ secrets.FLATHUB_STABLE_TOKEN }}
+        build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-    #- name: Validate build
-    #  run: |
-    #    flatpak-builder-lint repo repo
+    - name: Validate build
+      run: |
+        flatpak-builder-lint repo repo
 
     - name: Upload Flatpak
       uses: actions/upload-artifact@v4.3.3