Fixing artifact names evaluating the branches

This commit is contained in:
XargonWan 2023-09-30 11:02:35 +02:00
parent a2fab51b5a
commit 00f2cc51c9
3 changed files with 30 additions and 6 deletions

View file

@ -2,4 +2,8 @@
# This is building the bundle RetroDECK.flatpak after the download and build steps are done # 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 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

View file

@ -3,12 +3,22 @@
# This script is downloading the needed files to prepare the manifest build # This script is downloading the needed files to prepare the manifest build
git config --global protocol.file.allow always 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}/local
mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
flatpak-builder --user --force-clean \ flatpak-builder --user --force-clean \
--install-deps-from=flathub \ --install-deps-from=flathub \
--install-deps-from=flathub-beta \ --install-deps-from=flathub-beta \
--repo=${GITHUB_WORKSPACE}/local \ --repo=${GITHUB_WORKSPACE}/local \
--download-only \ --download-only \
${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ ${GITHUB_WORKSPACE}/"$FOLDER" \
net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml

View file

@ -1,14 +1,24 @@
#!/bin/bash #!/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 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}/local
mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker
flatpak-builder --user --force-clean \ flatpak-builder --user --force-clean \
--install-deps-from=flathub \ --install-deps-from=flathub \
--install-deps-from=flathub-beta \ --install-deps-from=flathub-beta \
--repo=${GITHUB_WORKSPACE}/local \ --repo=${GITHUB_WORKSPACE}/local \
--disable-download \ --disable-download \
${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ ${GITHUB_WORKSPACE}/"$FOLDER" \
net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml