[ci skip] CI: Manually specify flathub tag

.github/workflows/cron_publish_flatpak.yml

@@ -15,6 +15,11 @@ on:
         required: false
         type: boolean
         default: true
+      gitTag:
+        description: 'Tag to use for the AppStream release version (leave blank to detect it)'
+        required: false
+        type: string
+        default: ''
 
 jobs:
 
@@ -66,5 +71,5 @@ jobs:
       publish: ${{ inputs.publish || true }}
       fetchTags: true
       stableBuild: ${{ inputs.stableBuild || false }}
+      gitTag: ${{ inputs.gitTag || '' }}
     secrets: inherit
-

.github/workflows/linux_build_flatpak.yml

@@ -39,6 +39,10 @@ on:
         required: false
         type: boolean
         default: false
+      gitTag:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   build_linux:
@@ -64,6 +68,12 @@ jobs:
         shell: bash
         run: git config --global --add safe.directory "*"
 
+      - name: Prepare Flatpak tag
+        shell: bash
+        env:
+          PCSX2_GIT_TAG: ${{ inputs.gitTag }}
+        run: printf '%s\n' "$PCSX2_GIT_TAG" > .flatpak-git-tag
+
       - name: Add stable release identifier file
         if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
         shell: bash

.github/workflows/release_cut_new.yml

@@ -117,6 +117,7 @@ jobs:
       publish: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prerelease == 'false' }} # prerelease builds are published by the cron job
       fetchTags: true
       stableBuild: ${{ inputs.is_prerelease == 'false' }}
+      gitTag: ${{ needs.cut-release.outputs.new_tag }}
     secrets: inherit
 
   # Windows

.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

@@ -72,7 +72,7 @@
         "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/bin/resources/icons/AppIconLarge.png\" \"${FLATPAK_DEST}/share/icons/hicolor/512x512/apps/net.pcsx2.PCSX2.png\"",
         "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/pcsx2-qt.desktop\" \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
         "desktop-file-edit --set-key=Icon --set-value=net.pcsx2.PCSX2 \"${FLATPAK_DEST}/share/applications/net.pcsx2.PCSX2.desktop\"",
-        "${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/generate-metainfo.sh \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\"",
+        "${FLATPAK_BUILDER_BUILDDIR}/.github/workflows/scripts/linux/generate-metainfo.sh \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\" \"$(cat \"${FLATPAK_BUILDER_BUILDDIR}/.flatpak-git-tag\")\"",
         "cat \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\"",
         "install -Dm644 \"${FLATPAK_BUILDER_BUILDDIR}/net.pcsx2.PCSX2.metainfo.xml\" \"${FLATPAK_DEST}/share/metainfo/net.pcsx2.PCSX2.metainfo.xml\"",
         "mkdir -p \"${FLATPAK_DEST}/lib/ffmpeg\""

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

@@ -2,14 +2,17 @@
 
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
 
-if [[ $# -lt 1 ]]; then
-	echo "Output file must be provided as a parameter"
+if [[ $# -lt 1 || $# -gt 2 ]]; then
+	echo "Syntax: $0 <output file> [git tag]"
 	exit 1
 fi
 
 OUTFILE=$1
 GIT_DATE=$(git log -1 --pretty=%cd --date=iso8601)
-GIT_VERSION=$(git tag --points-at HEAD)
+GIT_VERSION=${2:-}
+if [[ -z "${GIT_VERSION}" ]]; then
+	GIT_VERSION=$(git tag --points-at HEAD --sort=-version:refname | head -n 1)
+fi
 GIT_HASH=$(git rev-parse HEAD)
 
 if [[ -z "${GIT_VERSION}" ]]; then
@@ -41,4 +44,3 @@ cp "${SCRIPTDIR}"/pcsx2-qt.metainfo.xml.in "${OUTFILE}"
 sed -i -e "s/@GIT_VERSION@/${GIT_VERSION}/" "${OUTFILE}"
 sed -i -e "s/@GIT_DATE@/${GIT_DATE}/" "${OUTFILE}"
 sed -i -e "s/@GIT_HASH@/${GIT_HASH}/" "${OUTFILE}"
-