From 00f2cc51c90f16b75d72f37fe2e4a1238d943b47 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Sep 2023 11:02:35 +0200 Subject: [PATCH 001/100] Fixing artifact names evaluating the branches --- automation_tools/flatpak_build_bundle.sh | 6 +++++- automation_tools/flatpak_build_download_only.sh | 14 ++++++++++++-- automation_tools/flatpak_build_only.sh | 16 +++++++++++++--- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh index 8c155810..cef69eff 100755 --- a/automation_tools/flatpak_build_bundle.sh +++ b/automation_tools/flatpak_build_bundle.sh @@ -2,4 +2,8 @@ # This is building the bundle RetroDECK.flatpak after the download and build steps are done -flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck \ No newline at end of file +if [ "${GITHUB_REF##*/}" = "main" ]; then + flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck +else + flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck +fi \ No newline at end of file diff --git a/automation_tools/flatpak_build_download_only.sh b/automation_tools/flatpak_build_download_only.sh index 55352780..009db9de 100755 --- a/automation_tools/flatpak_build_download_only.sh +++ b/automation_tools/flatpak_build_download_only.sh @@ -3,12 +3,22 @@ # This script is downloading the needed files to prepare the manifest build git config --global protocol.file.allow always + +if [ "${GITHUB_REF##*/}" = "main" ]; then + BUNDLE_NAME="RetroDECK.flatpak" + FOLDER=retrodeck-flatpak-cooker +else + BUNDLE_NAME="RetroDECK-cooker.flatpak" + FOLDER=retrodeck-flatpak-cooker +fi + mkdir -vp ${GITHUB_WORKSPACE}/local mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ --install-deps-from=flathub \ --install-deps-from=flathub-beta \ --repo=${GITHUB_WORKSPACE}/local \ --download-only \ - ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ - net.retrodeck.retrodeck.yml \ No newline at end of file + ${GITHUB_WORKSPACE}/"$FOLDER" \ + net.retrodeck.retrodeck.yml diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh index d2ed3fe5..abcb5306 100755 --- a/automation_tools/flatpak_build_only.sh +++ b/automation_tools/flatpak_build_only.sh @@ -1,14 +1,24 @@ #!/bin/bash -# This script is building the flatpak is the needed files are already downloaded +# This script is downloading the needed files to prepare the manifest build git config --global protocol.file.allow always + +if [ "${GITHUB_REF##*/}" = "main" ]; then + BUNDLE_NAME="RetroDECK.flatpak" + FOLDER=retrodeck-flatpak-cooker +else + BUNDLE_NAME="RetroDECK-cooker.flatpak" + FOLDER=retrodeck-flatpak-cooker +fi + mkdir -vp ${GITHUB_WORKSPACE}/local mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ --install-deps-from=flathub \ --install-deps-from=flathub-beta \ --repo=${GITHUB_WORKSPACE}/local \ --disable-download \ - ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ - net.retrodeck.retrodeck.yml \ No newline at end of file + ${GITHUB_WORKSPACE}/"$FOLDER" \ + net.retrodeck.retrodeck.yml From 95707e1b192bc35fd6de06c40a39206da04cdbda Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Sep 2023 11:03:09 +0200 Subject: [PATCH 002/100] The bar is blue!! --- net.retrodeck.retrodeck.appdata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 13806397..058aa862 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -76,7 +76,6 @@