From b5568b2ffad58334788797c305c1961c3f46cbc4 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Mon, 11 Apr 2022 21:28:00 +0900 Subject: [PATCH 1/5] I have to remember to enable the auto save in code once creating a new VM --- .github/workflows/cooker.yml | 34 +---------------------- .github/workflows/main.yml | 52 +++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4d27c088..065d6e4f 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,19 +6,13 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: -<<<<<<< HEAD branches: - cooker pull_request: branches: - cooker -======= - branches: [ '*' ] - pull_request: - branches: [ '*' ] ->>>>>>> main - # Allows you to run this workflow manually from the Actions tab +# Allows you to run this workflow manually from the Actions tab workflow_dispatch: # A workflow run is made up of one or more jobs that can run sequentially or in parallel @@ -35,7 +29,6 @@ jobs: - name: Prepearing enviornment run: | -<<<<<<< HEAD git submodule init git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak @@ -43,11 +36,6 @@ jobs: 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 apt install flatpak flatpak-builder - 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 ->>>>>>> main # Runs a set of commands using the runners shell - name: Building flatpak @@ -56,7 +44,6 @@ jobs: sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck -<<<<<<< HEAD - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" @@ -65,31 +52,12 @@ jobs: uses: ncipollo/release-action@v1 with: tag: "${{ steps.date.outputs.date }}" -======= - - name: Publish the flatpak in a new cooker release - uses: ncipollo/release-action@v1 - with: - tag: "${{ steps.version.outputs.version }}" ->>>>>>> main body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. -<<<<<<< HEAD Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. -======= - Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues on this build and instead post in the `#pre-release-feedback` section of discord. - - See the [wiki](https://amberelec.org/Contributing-to-AmberELEC) for more info. - - ### Changes (since last prerelease version): - ${{ github.event.client_payload.release_notes }} - - ### Upgrade Instructions - You can update to this release using the `prerelease` channel on your device. This is the recommended way to use prerelease versions. - ->>>>>>> main artifacts: "RetroDECK.flatpak" allowUpdates: true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fbac637f..35c42c97 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,14 +1,16 @@ -# This is a basic workflow to help you get started with Actions +# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged -name: main +name: Main # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] - pull_request: - branches: [ main ] + branches: + - main + pull_request: + branches: + - main # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -16,7 +18,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + build_cooker_snap: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -25,10 +27,42 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - # Runs a set of commands using the runners shell - - name: Build flatpak + - name: Prepearing enviornment + run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + 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 + + # Runs a set of commands using the runners shell + - name: Building flatpak run: | - sudo ./build-flatpak.sh 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 + + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.date.outputs.date }}" + body: | + # Release Notes + + Changelog: + - + - + - + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: true + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK \ No newline at end of file From beb23f2c0ee8ce8e4757e1c48984443515f17ec2 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 12 Apr 2022 09:02:47 +0900 Subject: [PATCH 2/5] Removed old build instructions --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index aa2af80e..9479d748 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ No, I don't support Windows, but the project is fully opensource so you can port **Can I help?**\ Of course, any help is appreciated. -If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes: -``` -git clone --recursive https://github.com/XargonWan/RetroDECK.git -cd RetroDECK -./build-retrodeck.sh -``` +#If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes: +#``` +#git clone --recursive https://github.com/XargonWan/RetroDECK.git +#cd RetroDECK +#./build-retrodeck.sh +#``` Join our [Discord](https://discord.gg/Dz3szYsP8g)! From e1a8d96084a9b435bc1678293b78ffe9bc9c419e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 12 Apr 2022 09:03:44 +0900 Subject: [PATCH 3/5] Updated readme --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9479d748..09df9e4c 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,7 @@ No, I don't support Windows, but the project is fully opensource so you can port **Can I help?**\ Of course, any help is appreciated. -#If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes: -#``` -#git clone --recursive https://github.com/XargonWan/RetroDECK.git -#cd RetroDECK -#./build-retrodeck.sh -#``` +If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes: +***Coming soon*** Join our [Discord](https://discord.gg/Dz3szYsP8g)! From 1bc8ec759ec2a8877d742850965284efd1683bbe Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 12 Apr 2022 09:04:24 +0900 Subject: [PATCH 4/5] 351 to Amber --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09df9e4c..d9a458e8 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Powered by [EmulationStation Desktop Edition](https://es-de.org), RetroArch and Means that all the configurations are ready and tweaked to get the best graphics and perfomances on the Deck itself without having the hassle to choose, install and congifure tons of emulators: just put your games in the roms folder, provide your own bioses and you can start your games. **Do I have to partition my disk to install it?**\ -No, no partitioning or format is required: RetroDECK, diffrentely from 351ELEC, Batocera & co. comes as a flatpak: just install it as any other application and launch it from your desktop or Steam library. +No, no partitioning or format is required: RetroDECK, diffrentely from AmberELEC, Batocera & co. comes as a flatpak: just install it as any other application and launch it from your desktop or Steam library. **Is it available on Windows?**\ No, I don't support Windows, but the project is fully opensource so you can port it if you wish. From 8dd8293a93de5806ed64939fc676d12d92412a93 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 12 Apr 2022 09:05:08 +0900 Subject: [PATCH 5/5] 351 to Amber --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9a458e8..977e8325 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **RetroDECK** brings an enviornment to catalog and play your retro games directly from SteamOS and it's tailored specifically for the **Steam Deck**. -It's inspired from embedded emulation systems like 351ELEC, EmuELEC, CoreELEC, Lakka, and Batocera. +It's inspired from embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera. Powered by [EmulationStation Desktop Edition](https://es-de.org), RetroArch and standalone emulators allows you to import your favorite retro (but even not-so-retro) games in a tidy enviornment without flooding your Steam library.