ci: Switch Flatpak build to flathub-infra/flatpak-github-actions (PCS…

…X2#10838)

* ci: Switch Flatpak build to flathub-infra/flatpak-github-actions

Flathub team has recently forked flatpak-github-actions and merged
various PRs submitted to the original repo. However, it's not versioned
(yet?), so pin the latest commit instead.

Additionally, enable validation of the build using flatpak-builder-lint,
and run all steps in the container with the runtime and required tooling
baked in.

* Update mirror-screenshots-url

* Shush git complaining about "dubious" ownership

* Update date format to iso8601

* Fix flatpak-builder-lint invocations

.github/workflows/linux_build_flatpak.yml

@@ -48,13 +48,17 @@ jobs:
   build_linux:
     name: ${{ inputs.jobName }}
     runs-on: ${{ inputs.os }}
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.6
+      options: --privileged
     timeout-minutes: 60
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
 
       # Hackity hack. When running the workflow on a schedule, we don't have the tag,
       # it doesn't fetch tags, therefore we don't get a version. So grab them manually.
@@ -81,65 +85,52 @@ jobs:
           PR_SHA: ${{ github.event.pull_request.head.sha }}
         run: ./.github/workflows/scripts/common/name-artifacts.sh
 
-      - name: Install Packages
-        env:
-          COMPILER: ${{ inputs.compiler }}
-        run: .github/workflows/scripts/linux/install-packages-flatpak.sh
-
       - name: Download patches
         run: |
           cd bin/resources
-          aria2c -Z "${{ inputs.patchesUrl }}/patches.zip"
+          wget "${{ inputs.patchesUrl }}/patches.zip"
 
       - name: Generate AppStream XML
         run: |
+          git config --global --add safe.directory "*"
           ./.github/workflows/scripts/linux/generate-metainfo.sh .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
           cat .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
-          flatpak run org.freedesktop.appstream-glib validate .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
+          flatpak-builder-lint appstream .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
 
       - name: Validate manifest
         run: |
-          flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+          flatpak-builder-lint manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
 
       - name: Build Flatpak
-        # TODO - based on v6.3, switch back to the main action once change is accepted (or they release a breaking change that uses upload-artifact@v4)
-        uses: xTVaser/flatpak-github-actions/flatpak-builder@64267d4cf01f7955a40128039d0abab17bb48aac
+        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
           upload-artifact: false
           manifest-path: .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
           arch: x86_64
           build-bundle: true
           verbose: true
-          mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
+          mirror-screenshots-url: https://dl.flathub.org/media
           branch: ${{ inputs.branch }}
           cache: true
           restore-cache: true
           cache-key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} flatpak ${{ hashFiles('.github/workflows/scripts/linux/flatpak/**/*.json') }}
 
-      - name: Commit screenshots to OSTree
+      - name: Validate build
         run: |
-          ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
-
-      #- name: Validate build directory
-      #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app
-      #
-      #- name: Validate repo
-      #  run: |
-      #    flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+          flatpak-builder-lint repo repo
 
       - name: Push to Flathub beta
         if: inputs.publish == true && inputs.branch == 'beta'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
 
       - name: Push to Flathub stable
         if: inputs.publish == true && inputs.branch == 'stable'
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.3
+        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: stable

.github/workflows/scripts/linux/generate-metainfo.sh

@@ -8,7 +8,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 OUTFILE=$1
-GIT_DATE=$(git log -1 --pretty=%cd --date=short)
+GIT_DATE=$(git log -1 --pretty=%cd --date=iso8601)
 GIT_VERSION=$(git tag --points-at HEAD)
 GIT_HASH=$(git rev-parse HEAD)