Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-25 23:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed wrong merge

Browse source
This commit is contained in:
XargonWan 2023-12-18 09:06:44 +01:00
parent 56e59ae9d8
commit 0767c69ec3
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/main-selfhosted.yml vendored
View file

@ -40,10 +40,6 @@ jobs:
- name: "Install dependencies" - name: "Install dependencies"
run: "automation_tools/install_dependencies.sh" run: "automation_tools/install_dependencies.sh"
# backing up manifest in case download fails and hashes must be recalculated
- name: Manifest backup
run: "cp ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak"
- name: Run pre-build automation tasks - name: Run pre-build automation tasks
run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
@ -75,11 +71,10 @@ jobs:
if: steps.flatpak-download.outcome == 'failure' if: steps.flatpak-download.outcome == 'failure'
run: | run: |
echo "Download failed, maybe some hash changed since the build start." echo "Download failed, maybe some hash changed since the build start."
git checkout -- net.retrodeck.retrodeck.yml
echo "Recalculating hashes and retrying download..." echo "Recalculating hashes and retrying download..."
rm -f "{GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
cp "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
"${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
"${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
- name: Build flatpak - name: Build flatpak
run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh" run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"

2
net.retrodeck.retrodeck.appdata.xml
View file

@ -65,7 +65,7 @@
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<releases> <releases>
<release version="0.7.5b" date="2023-14-12"> <release version="0.7.5b" date="2023-12-14">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.5b</url> <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.5b</url>
<description> <description>
<p>Bug fixes and other changes:</p> <p>Bug fixes and other changes:</p>