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

Fixing the mess after the merge (hopefully)

Browse source
This commit is contained in:
XargonWan 2023-12-20 09:32:37 +01:00
parent 6c5a9175d1
commit e3ae6b6d57
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/cooker-selfhosted.yml vendored
View file

@ -151,4 +151,3 @@ jobs:
name: retrodeck-flatpak name: retrodeck-flatpak
path: RetroDECK-cooker.flatpak path: RetroDECK-cooker.flatpak
continue-on-error: true continue-on-error: true

2
automation_tools/version_extractor.sh
View file

@ -29,6 +29,6 @@ fetch_manifest_version(){
# Use awk to extract the value of the first iteration of VERSION variable # Use awk to extract the value of the first iteration of VERSION variable
manifest_version=$(echo "$manifest_content" | awk '/VERSION=/ && !/#/ { sub(/.*VERSION=/, ""); sub(/#.*/, ""); print; exit }') manifest_version=$(echo "$manifest_content" | awk '/VERSION=/ && !/#/ { sub(/.*VERSION=/, ""); sub(/#.*/, ""); print; exit }')
# Trim leading and trailing whitespace # Trim leading and trailing whitespace
manifest_version=$(echo "$manifest_version" | awk '{gsub(/[^0-9.a-zA-Z]/,""); print}') manifest_version=$(echo "$manifest_version" | awk '{$1=$1;print}')
echo "$manifest_version" echo "$manifest_version"
} }

8
net.retrodeck.retrodeck.yml
View file

@ -34,7 +34,7 @@ finish-args:
- --talk-name=org.freedesktop.login1.Manager - --talk-name=org.freedesktop.login1.Manager
- --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
- --filesystem=xdg-run/app/com.discordapp.Discord:create - --filesystem=xdg-run/app/com.discordapp.Discord:create
- --filesystem=xdg-config/gtk-3.0:ro #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home
# Dolphin # Dolphin
- --allow=bluetooth - --allow=bluetooth
# PPSSPP # PPSSPP
@ -79,15 +79,15 @@ modules:
# The version number is hardcoded in /app/retrodeck/version # The version number is hardcoded in /app/retrodeck/version
# #
# UPDATE STEPS FOR MAIN: # UPDATE STEPS FOR MAIN:
# [x] Update the VERSION variable on line containing "VERSION=THISBRANCH" # [X] Update the VERSION variable on line containing "VERSION=THISBRANCH"
# [x] Update the appdata.xml with the version number and notes # [X] Update the appdata.xml with the version number and notes
# #
- name: version-initialization - name: version-initialization
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- | - |
# on main please update this with the version variable, eg: VERSI0N='0.7.5b' # on main please update this with the version variable, eg: VERSION='0.7.4b'
# on cooker will be THISBRANCH # on cooker will be THISBRANCH
VERSION="0.7.5b" VERSION="0.7.5b"