diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml
index 065d6e4f..ecc12226 100644
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@@ -7,10 +7,10 @@ on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches:
- - cooker
+ - cooker*
pull_request:
branches:
- - cooker
+ - cooker*
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
@@ -35,23 +35,26 @@ jobs:
sudo apt-get update
sudo apt install flatpak flatpak-builder p7zip-full
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08
+ sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
- # Runs a set of commands using the runners shell
- name: Building flatpak
run: |
- sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml
- sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
- sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
+ sudo flatpak-builder --user --install --force-clean --repo=local retrodeck-flatpak net.retrodeck.retrodeck.yml
+ sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck
- name: Get date for artifacts
id: date
run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')"
+ - name: Extract branch name
+ shell: bash
+ run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+ id: extract_branch
+
- name: Publish the flatpak in a new cooker release
uses: ncipollo/release-action@v1
with:
- tag: "${{ steps.date.outputs.date }}"
+ tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}"
body: |
# Release Notes (Cooker)
This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e6a4e36..1b8a8bdc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,14 +35,14 @@ jobs:
sudo apt-get update
sudo apt install flatpak flatpak-builder p7zip-full
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08
+ sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
# Runs a set of commands using the runners shell
- name: Building flatpak
run: |
- sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml
- sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
- sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
+ sudo flatpak-builder --user --install --force-clean retrodeck-flatpak net.retrodeck.retrodeck.yml
+ sudo flatpak-builder --repo=local --force-clean localrepo net.retrodeck.retrodeck.yml
+ sudo flatpak build-bundle local RetroDECK.flatpak net.retrodeck.retrodeck
- name: Get date for artifacts
id: date
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..765bfe6e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# RetroDECK specific files #
+############################
+.flatpak-builder/
+retrodeck-flatpak-cooker/
+retrodeck-flatpak/
diff --git a/README.md b/README.md
index 230d9cac..c3c7e71d 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Powered by [EmulationStation Desktop Edition](https://es-de.org), which uses Ret
Join our [Discord](https://discord.gg/Dz3szYsP8g)!
-
-
+
+
@@ -28,50 +28,8 @@ No partitioning or formatting is required. RetroDECK (differently from AmberELEC
## Is it available on Windows?
No, RetroDECK doesn't support Windows, but the project is fully open source so you can port it if you wish. As an alternative, [Retrobat](http://www.retrobat.ovh/) offers similar functionality (but may not be compatible with RetroDECK's rom paths).
+## How can I install it?
+Check the [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki#installation-instructions) on the Wiki
+
## Can I help?
-Of course, any help is appreciated, and not only byp rogramming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!
-
-# Developer notes: build instructions
-
-If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes:
-```
-cd ~
-git clone --recursive https://github.com/XargonWan/RetroDECK.git
-cd RetroDECK
-git submodule init
-git submodule update
-```
-
-install `flatpak flatpak-builder p7zip-full` with your distro's package manager.
-
-```flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
-```
-
-To build the stable release:
-```
-flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-main ~/RetroDECK/com.xargon.retrodeck.yml
-flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck
-```
-
-Or alternatively, to build the cooker (experimental) release:
-```
-git checkout cooker
-flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-cooker ~/RetroDECK/com.xargon.retrodeck.yml
-flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck
-```
-
-Install RetroDECK:
-```
-flatpak install com.xargon.retrodeck
-```
-
-Run RetroDECK:
-```
-flatpak run com.xargon.retrodeck
-```
-
-Uninstall RetroDECK:
-```
-flatpak uninstall com.xargon.retrodeck
-```
+Of course, any help is appreciated, and not only by programming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!
diff --git a/docs/index.html b/docs/index.html
index f983c07d..900eb69d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -42,7 +42,7 @@
-