From c5abfe431c7beb92e0bdc3b17dfa40721475d70b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 30 Sep 2023 14:09:01 +0200 Subject: [PATCH] Min pipeline fixes --- .github/workflows/main-selfhosted.yml | 1 - automation_tools/flatpak_build_only.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index b71961c6..4e533c2d 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -76,7 +76,6 @@ jobs: hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact.tar.gz)) echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact.sha mv -f RetroDECK-Artifact.* ${{ secrets.ARTIFACT_REPO }} - continue-on-error: true - name: Create Bundle run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_bundle.sh" diff --git a/automation_tools/flatpak_build_only.sh b/automation_tools/flatpak_build_only.sh index abcb5306..6ec4597f 100755 --- a/automation_tools/flatpak_build_only.sh +++ b/automation_tools/flatpak_build_only.sh @@ -6,14 +6,14 @@ git config --global protocol.file.allow always if [ "${GITHUB_REF##*/}" = "main" ]; then BUNDLE_NAME="RetroDECK.flatpak" - FOLDER=retrodeck-flatpak-cooker + FOLDER=retrodeck-flatpak-main else BUNDLE_NAME="RetroDECK-cooker.flatpak" FOLDER=retrodeck-flatpak-cooker fi mkdir -vp ${GITHUB_WORKSPACE}/local -mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker +mkdir -vp ${GITHUB_WORKSPACE}/"$FOLDER" flatpak-builder --user --force-clean \ --install-deps-from=flathub \