From 5b5700d27ad09d4829adf14c139abfb9751b984c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 2 Apr 2022 22:48:09 +0900 Subject: [PATCH 01/16] Update main.yml sudo --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35bdf1ef..7023d2e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: # Runs a set of commands using the runners shell - name: Run a multi-line script run: | - ./build-flatpak.sh - flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml - flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + 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 From d2e4bae5ac021efbb18fbebbe15e2b231b3ec2fa Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:35:09 +0900 Subject: [PATCH 02/16] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7023d2e9..1e685fe3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: beta-build +name: cooker # Controls when the workflow will run on: @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 # Runs a set of commands using the runners shell - - name: Run a multi-line script + - name: Build flatpak run: | sudo ./build-flatpak.sh sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml From ac9dcd54f69890f8d994e65f15543320f14e1fe7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Apr 2022 22:15:44 +0900 Subject: [PATCH 03/16] Bugfix: SD Card was not rw --- com.xargon.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 890e1b65..77833256 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -12,6 +12,7 @@ finish-args: - --share=network - --device=all - --filesystem=~/retrodeck:create + - --filesystem=/run/media/mmcblk0p1 - --allow=multiarch - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.PowerManagement.Inhibit From d2a5488d6860419b3aa004e0de407b41ad7efb7c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 4 Apr 2022 23:46:36 +0900 Subject: [PATCH 04/16] Create cooker.yml --- .github/workflows/cooker.yml | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/cooker.yml diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml new file mode 100644 index 00000000..f8ecaf45 --- /dev/null +++ b/.github/workflows/cooker.yml @@ -0,0 +1,58 @@ +# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ '*' ] + pull_request: + branches: [ '*' ] + + # 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 +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # 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 + 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 + + - name: Create pre-release as draft at first to hide during uploads + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.version.outputs.version }}" + body: | + # Release Notes (Cooker) + This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + + 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. + + + artifacts: "RetroDECK.flatpak" + prerelease: true + draft: true + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker From 040b907f6ed5caae645c59cdafd339fe4fe8018c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 4 Apr 2022 23:49:27 +0900 Subject: [PATCH 05/16] Update cooker.yml --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f8ecaf45..75dd352c 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -1,6 +1,6 @@ # Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged -name: CI +name: Cooker # Controls when the workflow will run on: From 8b99752e8c9d643d174ffe441fd5d6b8de99801c Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Mon, 4 Apr 2022 23:52:43 +0900 Subject: [PATCH 06/16] Update cooker.yml --- .github/workflows/cooker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 75dd352c..129d77b0 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -52,7 +52,8 @@ jobs: artifacts: "RetroDECK.flatpak" + allowUpdates: true prerelease: true - draft: true + draft: false token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker From ff75fd603aa66e34b5b98618c15aa7fdc6272762 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:23:18 +0900 Subject: [PATCH 07/16] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e685fe3..fbac637f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: cooker +name: main # Controls when the workflow will run on: From 8a24961dbf9260377d7f540c83721865b6e4e8a1 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:26:10 +0900 Subject: [PATCH 08/16] Update cooker.yml --- .github/workflows/cooker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 129d77b0..c0d37773 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -28,6 +28,9 @@ jobs: # Runs a set of commands using the runners shell - name: Build flatpak run: | + sudo apt install flatpak flatpak-builder + 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 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 From 8c4381335304d25b5ce75ba7b17a76efe520be00 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:27:23 +0900 Subject: [PATCH 09/16] Update cooker.yml --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c0d37773..4d05e95d 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -29,8 +29,8 @@ jobs: - name: Build flatpak run: | sudo apt install flatpak flatpak-builder - 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 + 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 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 From c7403815a1bade05bdc1a1f557dc15e1512e21bd Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:37:39 +0900 Subject: [PATCH 10/16] Update cooker.yml --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4d05e95d..f5d6ee31 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,9 +6,9 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ '*' ] + branches: [ integrated ] pull_request: - branches: [ '*' ] + branches: [ integrated ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 8f4678c512ac2a87f76b584b7eaa2e8aa7a6be65 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 21:53:10 +0900 Subject: [PATCH 11/16] Update cooker.yml --- .github/workflows/cooker.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index f5d6ee31..3f8b5cb6 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -25,17 +25,20 @@ 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: | - sudo apt install flatpak flatpak-builder + sudo apt install flatpak flatpak-builder 7z 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 + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 7z + + # 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 - - name: Create pre-release as draft at first to hide during uploads + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: tag: "${{ steps.version.outputs.version }}" From f8e51f01ad3a0b70723a9539c30ac075b4d0918b Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 21:56:28 +0900 Subject: [PATCH 12/16] Update cooker.yml --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 3f8b5cb6..dda4f366 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -27,7 +27,7 @@ jobs: - name: Prepearing enviornment run: | - sudo apt install flatpak flatpak-builder 7z + sudo apt install flatpak flatpak-builder 7zip 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 7z From 1a20bb82fdf510ce42edb9fb7c0adff70295cfe3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 21:59:03 +0900 Subject: [PATCH 13/16] Update cooker.yml --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index dda4f366..d9e529f7 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -27,9 +27,9 @@ jobs: - name: Prepearing enviornment run: | - sudo apt install flatpak flatpak-builder 7zip + 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 7z + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 # Runs a set of commands using the runners shell - name: Building flatpak From 42058ffd9be29a8bdaa323326367bcb555b1fcaa Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:07:30 +0900 Subject: [PATCH 14/16] Update cooker.yml --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d9e529f7..e1d35780 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -16,7 +16,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 From fbbe5830fdcc104ba9f1ea9113bb250267449bc9 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:11:54 +0900 Subject: [PATCH 15/16] Update cooker.yml --- .github/workflows/cooker.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index e1d35780..d45ac3b9 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,9 +6,11 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ integrated ] + branches: + - integrated pull_request: - branches: [ integrated ] + branches: + - integrated # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From aa7cd8d2774f59c9490fe6432cfcfd760d617296 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:16:52 +0900 Subject: [PATCH 16/16] Update cooker.yml --- .github/workflows/cooker.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d45ac3b9..8f197aa1 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,11 +6,9 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: - - integrated - pull_request: - branches: - - integrated + branches: [ '*' ] + pull_request: + branches: [ '*' ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: