Merge remote-tracking branch 'upstream/cooker-0.6.2b' into cooker-0.6.2b-icenine451

This commit is contained in:
icenine451 2023-03-08 15:07:59 -05:00
commit 1b88540d99
2 changed files with 19 additions and 10 deletions

View file

@ -69,6 +69,15 @@
<releases>
<release version="0.6.2b" date="2023-03-08">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.2b</url>
<description>
<ul>
<li></li>
</ul>
</description>
</release>
<release version="0.6.1b" date="2023-02-21">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.1b</url>
<description>

View file

@ -66,11 +66,11 @@ modules:
# The version number is hardcoded in /app/retrodeck/version
#
# UPDATE STEPS FOR MAIN:
# [X] Update the VERSION variable
# [X] Update the appdata.xml with the version number and notes
# [X] change branch into main in version-initialization (first one)
# [X] change branch into main in retrodeck module (last one)
# [X] if header (before modules) was edited, edit it even in flathub.yml
# [ ] Update the VERSION variable
# [ ] Update the appdata.xml with the version number and notes
# [ ] change branch into main in version-initialization (first one)
# [ ] change branch into main in retrodeck module (last one)
# [ ] if header (before modules) was edited, edit it even in flathub.yml
#
- name: version-initialization
buildsystem: simple
@ -78,7 +78,7 @@ modules:
- |
git checkout ${GITHUB_REF_NAME}
mkdir -p ${FLATPAK_DEST}/retrodeck/
VERSION="0.6.1b"
VERSION="cooker-0.6.2b"
if [[ $VERSION == *"cooker"* ]];
then
VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@ -88,7 +88,7 @@ modules:
sources:
- type: git
url: https://github.com/XargonWan/RetroDECK.git
branch: main
branch: cooker-0.6.2b
- name: xmlstarlet
config-opts:
@ -732,8 +732,8 @@ modules:
sources:
- type: git
url: https://github.com/xemu-project/xemu.git
tag: v0.7.84
commit: d8fa50e524c22f85ecb2e43108fd6a5501744351
tag: v0.7.85
commit: 065c74a00fe402f65147e9b0d1a1eeac1b4b609f
x-checker-data:
type: json
url: https://api.github.com/repos/xemu-project/xemu/releases/latest
@ -1089,4 +1089,4 @@ modules:
sources:
- type: git
url: https://github.com/XargonWan/RetroDECK.git
branch: main
branch: cooker-0.6.2b