From a3663eba8c7a01c124e3801ffc942e1d3068afe6 Mon Sep 17 00:00:00 2001 From: Ty Lamontagne Date: Thu, 2 Jan 2025 16:35:20 -0500 Subject: [PATCH] CI: Dry run flathub stable push --- .github/workflows/cron_publish_flatpak.yml | 2 +- .github/workflows/linux_build_flatpak.yml | 6 ++++-- .github/workflows/scripts/linux/generate-metainfo.sh | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cron_publish_flatpak.yml b/.github/workflows/cron_publish_flatpak.yml index c6a9aeb4b8602..3e6cf0af57938 100644 --- a/.github/workflows/cron_publish_flatpak.yml +++ b/.github/workflows/cron_publish_flatpak.yml @@ -44,6 +44,6 @@ jobs: cmakeflags: "" publish: true fetchTags: true - stableBuild: false + stableBuild: true secrets: inherit diff --git a/.github/workflows/linux_build_flatpak.yml b/.github/workflows/linux_build_flatpak.yml index 50b1062db9b4b..7f39e3a7cbb2e 100644 --- a/.github/workflows/linux_build_flatpak.yml +++ b/.github/workflows/linux_build_flatpak.yml @@ -64,8 +64,10 @@ jobs: # it doesn't fetch tags, therefore we don't get a version. So grab them manually. # actions/checkout elides tags, fetch them primarily for releases - name: Fetch tags - if: ${{ inputs.fetchTags }} - run: git fetch --tags --no-recurse-submodules + # if: ${{ inputs.fetchTags }} + run: | + git fetch --tags --no-recurse-submodules --depth=1 + git checkout 2d5faa627ff54f3fb2a69a43286181bee071a1c3 - name: Add stable release identifier file if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }} diff --git a/.github/workflows/scripts/linux/generate-metainfo.sh b/.github/workflows/scripts/linux/generate-metainfo.sh index 33b8f42359e6f..e3760e4b6cbfd 100755 --- a/.github/workflows/scripts/linux/generate-metainfo.sh +++ b/.github/workflows/scripts/linux/generate-metainfo.sh @@ -21,7 +21,11 @@ if [[ "${GIT_VERSION}" == "" ]]; then fi echo "GIT_DATE: ${GIT_DATE}" + echo "GIT_VERSION: ${GIT_VERSION}" +GIT_VERSION= $(echo ${GIT_VERSION} | awk '{print $1;}') +echo "GIT_VERSION after multiple tag removal: ${GIT_VERSION}" + echo "GIT_HASH: ${GIT_HASH}" cp "${SCRIPTDIR}"/pcsx2-qt.metainfo.xml.in "${OUTFILE}"