mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2025-01-31 12:35:39 +00:00
Merge branch 'main' of https://github.com/XargonWan/RetroDECK into cooker
This commit is contained in:
XargonWan
commit
1e13c7da56
2
.github/workflows/flathub_push_cooker.yml
vendored
2
.github/workflows/flathub_push_cooker.yml
vendored
|
|
@ -85,4 +85,4 @@ jobs:
|
|||
git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch"
|
||||
|
||||
git remote -v
|
||||
git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git $relname
|
||||
git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git $relname
|
||||
|
|
|
|||
84
.github/workflows/flathub_push_main.yml
vendored
Normal file
84
.github/workflows/flathub_push_main.yml
vendored
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
|
||||
name: PUSH-main-flathub
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
|
||||
Pushing_main_into_flathub:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Pushing
|
||||
shell: bash
|
||||
run: |
|
||||
|
||||
# EDITABLES:
|
||||
rd_branch=${GITHUB_REF_NAME} # should be main
|
||||
echo $rd_branch
|
||||
gits_folder="${GITHUB_WORKSPACE}/gits" # without last /
|
||||
|
||||
mkdir -vp $gits_folder
|
||||
cd $gits_folder
|
||||
if [ -d flathub ]; then
|
||||
rm -rf flathub
|
||||
fi
|
||||
git clone --recursive https://github.com/flathub/net.retrodeck.retrodeck.git flathub
|
||||
cd $gits_folder
|
||||
git clone --recursive https://github.com/XargonWan/RetroDECK RetroDECK
|
||||
cd $gits_folder/RetroDECK
|
||||
|
||||
git checkout $rd_branch
|
||||
git submodule init
|
||||
git submodule update
|
||||
# NOTE: the only linked submodules are: rd-submodules/retroarch
|
||||
# these must be included in the exclusion list as they must be redownloaded
|
||||
#sync -rav --progress --exclude={'res/screenshots/','shared-modules/','rd-submodules/retroarch','.git/','docs','retrodeck-flatpak/','retrodeck-flatpak-cooker/','.flatpak-builder/'} ~/RetroDECK/ ~/flathub/
|
||||
|
||||
cd $gits_folder/flathub
|
||||
|
||||
git checkout master
|
||||
|
||||
git rm -rf *
|
||||
git clean -fxd # restroing git index
|
||||
|
||||
# Copying only a few files as the others are cloned by git in retrodeck.sh
|
||||
cd $gits_folder/RetroDECK
|
||||
cp -rf \
|
||||
'flathub.json' \
|
||||
'LICENSE' \
|
||||
'flathub.yml' \
|
||||
'README.md' \
|
||||
$gits_folder/flathub/
|
||||
|
||||
cd $gits_folder/flathub
|
||||
ls -lah
|
||||
|
||||
# manipulating manifest
|
||||
mv flathub.yml net.retrodeck.retrodeck.yml
|
||||
|
||||
# Getting latest release name
|
||||
# version=$(\
|
||||
# curl -sL \
|
||||
# -H "Accept: application/vnd.github+json" \
|
||||
# -H "Authorization: Bearer ${{ secrets.TRIGGER_BUILD_TOKEN }}" \
|
||||
# https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases \
|
||||
# | jq .[0].tag_name \
|
||||
# | tr -d \" \
|
||||
# )
|
||||
|
||||
sha=$(curl -sL https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.sha)
|
||||
|
||||
sed -i "s#__SHA__#$sha#g" net.retrodeck.retrodeck.yml
|
||||
|
||||
echo -e "Resulting manifest:\n"
|
||||
cat net.retrodeck.retrodeck.yml
|
||||
|
||||
git config --global user.name "${{ secrets.GITNAME }}"
|
||||
git config --global user.email "${{ secrets.GITMAIL }}"
|
||||
|
||||
git add *
|
||||
git commit -m "Updated flathub/net.retrodeck.retrodeck from RetroDECK/$rd_branch"
|
||||
|
||||
git remote -v
|
||||
git push --force https://${{ secrets.TRIGGER_BUILD_TOKEN }}@github.com/flathub/net.retrodeck.retrodeck.git master
|
||||
10
README.md
10
README.md
|
|
@ -14,12 +14,12 @@ It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, L
|
|||
|
||||
Powered by [EmulationStation Desktop Edition](https://es-de.org), which uses RetroArch and other standalone emulators to allow you to import and play your favorite retro (and even not-so-retro) games in a tidy environment without flooding your Steam library.
|
||||
|
||||
Join our [Discord](https://discord.gg/Dz3szYsP8g)!
|
||||
Visit our [website](https://retrodeck.net) and Join our [Discord](https://discord.gg/Dz3szYsP8g)!
|
||||
<p float="center">
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.png?raw=true" alt="screenshot" width="300"/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.png?raw=true" alt="screenshot" width="300"/><br/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen01.png?raw=true" alt="screenshot" width="300"/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.png?raw=true" alt="screenshot" width="300"/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.jpeg?raw=true" alt="screenshot" width="300"/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.jpeg?raw=true" alt="screenshot" width="300"/><br/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true" alt="screenshot" width="300"/>
|
||||
<img src="https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true" alt="screenshot" width="300"/>
|
||||
</p>
|
||||
<br/>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,25 +14,25 @@
|
|||
<content_rating type="oars-1.0" />
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/logo.png?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen01.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen01.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen02.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen02.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen03.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen03.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen04.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen04.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen05.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen05.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/cooker/res/screenshots/screen06.jpeg?raw=true</image>
|
||||
<image>https://github.com/XargonWan/RetroDECK/blob/main/res/screenshots/screen06.jpeg?raw=true</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<description>
|
||||
|
|
@ -66,30 +66,50 @@
|
|||
</description>
|
||||
<project_license>GPL-3.0</project_license>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<releases>
|
||||
|
||||
<release version="0.5.0b" date="2022-10-11">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b</url>
|
||||
<releases>
|
||||
|
||||
<release version="0.5.0b" date="2022-10-11">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.5b</url>
|
||||
<description>
|
||||
<ul>
|
||||
<li>VERY IMPORTANT: We are moving your saves! This can take time on the first boot. If you miss some saves they are not gone. Please read more in the wiki.</li>
|
||||
<li>New Logo and Theme</li>
|
||||
<li>Two new themes added: Alekfull-NX-Light and Retrofix-Revisited</li>
|
||||
<li>Updated ES-DE to 1.2.6</li>
|
||||
<li>Implemented the first steps towards a universal Emulator Configuration Tool in the TOOLS menu</li>
|
||||
<li>Ability to log into your RetroAchievements account under the TOOLS menu for RetroArch only (supported standalones coming soon)</li>
|
||||
<li>Updated RetroArch and all the standalone emulators</li>
|
||||
<li>Added several free assets/fonts for RetroArch, PPSSPP, XEMU and BlueMSX</li>
|
||||
<li>Added a new DEFAULT Emulator for the PS2: PCSX2-QT (the former PCSX2 default emulator is now called "PCSX2 (Legacy)")</li>
|
||||
<li>Changed the DEFAULT Emulator for the PSX: Swanstation (Libretro) Core</li>
|
||||
<li>Added a new Standalone Emulator for the PSX: Duckstation</li>
|
||||
<li>Enhanced XEMU (XBOX) experience</li>
|
||||
<li>And more, for the complete patch notes please check the wiki...</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
|
||||
<release version="0.4.5b" date="2022-07-20">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.5b</url>
|
||||
<description>
|
||||
<ul>
|
||||
<li>IMPORTANT: Started saves migration, the saves are being moved to retrodeck/saves/systemname/emulator upon update, however if some emulators cannot load your saves you have to move them manually to the new path</li>
|
||||
<li>Theme revamp and more themes available such as the old one</li>
|
||||
<li>Updated RetroArch and its cores from 1.10.2 to 1.11.1</li>
|
||||
<li>Updated all the standalone emulators to their latest releases</li>
|
||||
<li>Updated ES-DE to 1.2.6</li>
|
||||
<li>Removed the unavailable emulators from the ES-DE list to avoid confusion</li>
|
||||
<li>Updated XEMU configurations and added its (free) assets</li>
|
||||
<li>Added free assets for RetroArch, PPSSPP and BlueMSX (libretro)</li>
|
||||
<li>New emulator: PCSX2-QT, it's now the default PS2 emulator. Former PCSX2 emulator is now called PCSX2 (Legacy).</li>
|
||||
<li>New emualtor: Duckstation for PSX.</li>
|
||||
<li>Swanstation (Libretro) is the new PSX default emulator, so if you don't find your saves just switch back to Beetle</li>
|
||||
<li>New varialbes system: now some variables such as game folder location are saved in /var/config/retrodeck/retrodeck.cfg.</li>
|
||||
<li>Solved an issue where Dolphin (Standalone) was not saving in the intended directories.</li>
|
||||
<li>Fixed a bug where new symlinks were not created correctly and users couldn't scrape their games</li>
|
||||
</ul>
|
||||
|
||||
<p>Known Issues:</p>
|
||||
<ul>
|
||||
<li>PCSX2: due to its limitation, the standalone PCSX2 doesn't have any way to set the hotkeys, so no save and load state, no quit button. In order to quit press: STEAM -> PCSX2 -> (X) CLOSE WINDOW, be aware that the state is not automatically saved</li>
|
||||
<li>Due to a Steam limitation, external controllers and keyboard seems not to be working, expecially in the desktop mode</li>
|
||||
</ul>
|
||||
|
||||
IMPORTANT NOTE:
|
||||
At the moment the emulator configs are reset during every update, this was made because every version they may bring new configurations, please back them up if you did some manual configs.
|
||||
</description>
|
||||
</release>
|
||||
|
||||
<release version="0.4.4b" date="2022-07-18">
|
||||
|
||||
<release version="0.4.4b" date="2022-07-18">
|
||||
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.4.4b</url>
|
||||
<description>
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ modules:
|
|||
# The version number is hardcoded in /app/retrodeck/version
|
||||
#
|
||||
# UPDATE STEPS FOR MAIN:
|
||||
# [ ] Update the VERSION variable
|
||||
# [ ] Update the appdata.xml with the version number and notes
|
||||
# [ ] change branch into main in retrodeck module (last one)
|
||||
# [ ] if header (before modules) was edited, edit it even in flathub.yml
|
||||
# [ ] change the screenshots link from cooker to 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
|
||||
#
|
||||
- name: version-initialization
|
||||
buildsystem: simple
|
||||
|
|
@ -76,7 +76,7 @@ modules:
|
|||
- |
|
||||
git checkout ${GITHUB_REF_NAME}
|
||||
mkdir -p ${FLATPAK_DEST}/retrodeck/
|
||||
VERSION="0.5.0b-cooker"
|
||||
VERSION="0.5.0b"
|
||||
if [[ $VERSION == *"cooker"* ]];
|
||||
then
|
||||
VERSION="cooker-"$(git rev-parse --short HEAD)
|
||||
|
|
@ -86,7 +86,7 @@ modules:
|
|||
sources:
|
||||
- type: git
|
||||
url: https://github.com/XargonWan/RetroDECK.git
|
||||
branch: cooker
|
||||
branch: main
|
||||
|
||||
- name: xmlstarlet
|
||||
config-opts:
|
||||
|
|
@ -1432,4 +1432,4 @@ modules:
|
|||
sources:
|
||||
- type: git
|
||||
url: https://github.com/XargonWan/RetroDECK.git
|
||||
branch: cooker
|
||||
branch: main
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ dir_prep() {
|
|||
# creating the symlink
|
||||
echo "linking $real in $symlink" #DEBUG
|
||||
mkdir -pv "$(dirname "$symlink")" # creating the full path except the last folder
|
||||
ln -sv "$real" "$symlink"
|
||||
ln -svf "$real" "$symlink"
|
||||
|
||||
# moving everything from the old folder to the new one, delete the old one
|
||||
if [ -d "$symlink.old" ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue