From d4f82d74cecbc983d81a26c5e8a83b8047eac158 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:12:37 +0200 Subject: [PATCH 01/76] Removed unused pipelines --- .github/workflows/TEST_release_info.yml | 62 ------- .github/workflows/cooker.yml | 205 ---------------------- .github/workflows/flathub_push_cooker.yml | 88 ---------- .github/workflows/main.yml | 188 -------------------- .github/workflows/remove-artifacts.yml | 22 --- 5 files changed, 565 deletions(-) delete mode 100644 .github/workflows/TEST_release_info.yml delete mode 100644 .github/workflows/cooker.yml delete mode 100644 .github/workflows/flathub_push_cooker.yml delete mode 100644 .github/workflows/main.yml delete mode 100644 .github/workflows/remove-artifacts.yml diff --git a/.github/workflows/TEST_release_info.yml b/.github/workflows/TEST_release_info.yml deleted file mode 100644 index ebf21609..00000000 --- a/.github/workflows/TEST_release_info.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: TEST_release_info - -on: - push: - branches: - - main - paths: - - .github/workflows/TEST_release_info.yml - pull_request: - branches: - - main - - workflow_dispatch: - - -jobs: - - Building_RetroDECK: - runs-on: ubuntu-latest - steps: - - - name: Generate build ID - id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")" - - - uses: actions/checkout@v3 - - - name: Initialize enviornment - run: | - git pull - git submodule init - git submodule update - sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet appstream-util - - - name: Validating the appdata - run: appstream-util validate "net.retrodeck.retrodeck.appdata.xml" - continue-on-error: true - - - name: Getting version info - id: version - run: | - appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml" - REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1) - DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')" - echo "REL_VER=$REL_VER" >> $GITHUB_ENV - echo -e "# Release Notes\n" >> "body.md" - echo "$DES" >> "body.md" - - - name: Publish the flatpak in a new release - uses: ncipollo/release-action@v1 - env: - REL_VER: ${{ env.REL_VER }} - with: - tag: ${{ env.REL_VER }} - name: "RetroDECK v${{ env.REL_VER }}" - bodyFile: "body.md" - #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" - allowUpdates: true - draft: true - token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - repo: RetroDECK - #continue-on-error: true \ No newline at end of file diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml deleted file mode 100644 index ff8330e3..00000000 --- a/.github/workflows/cooker.yml +++ /dev/null @@ -1,205 +0,0 @@ -name: cooker - -on: - # push: - # branches: - # - cooker* - # pull_request: - # branches: - # - cooker* - - workflow_dispatch: - - -jobs: - - Job1_-_Building_P1: - runs-on: ubuntu-latest - steps: - - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" - - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch - - - name: Generate build ID - id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" - - - uses: actions/checkout@v3 - - - name: Download global cache - uses: dawidd6/action-download-artifact@v2 - with: - workflow: cooker.yml - name: global-cache - search_artifacts: true - skip_unpack: true - continue-on-error: true - - - name: Extract global cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - continue-on-error: true - - - name: DEBUG - run: | - echo "Listing folder $PWD contents" - ls -lna - echo "Checking for version file" - find ~ -iname version - cat $(find ~ -iname version) - - - name: Initialize enviornment - run: | - git pull - 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 org.freedesktop.Sdk.Extension.llvm13 - - - name: Buld part 1 - Until melonds - run: | - sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - - - name: Compress cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: "${{ steps.generating_buildid.outputs.build-id }}" - path: retrodeck-cooker.tar.gz - - # this is done to speed up the things now, it may be removed later - - name: Compress global cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - continue-on-error: true - - - name: Upload global cache - uses: actions/upload-artifact@v3 - with: - name: global-cache - path: retrodeck-cooker.tar.gz RetroDECK.flatpak - continue-on-error: true - - outputs: - buildID: "${{ steps.generating_buildid.outputs.build-id }}" - - Job2_-_Build_P2_and_publish: - runs-on: ubuntu-latest - needs: [Job1_-_Building_P1] - steps: - - - uses: actions/checkout@v3 - - - name: Download build specific cache - uses: actions/download-artifact@v2 - with: - name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - - - name: Extract cache - run: | - tar --skip-old-files -xzvf retrodeck-cooker.tar.gz - rm -f retrodeck-cooker.tar.gz - - - name: DEBUG - run: | - echo "Listing folder $PWD contents" - ls -lna - echo "Checking for version file" - find ~ -iname version - cat $(find ~ -iname version) - - - name: Initialize enviornment - run: | - git pull - 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 org.freedesktop.Sdk.Extension.llvm13 - - - name: Create Bundle - run: | - sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml - sudo flatpak build-bundle $GITHUB_WORKSPACE/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: Read version from version file - id: version - run: echo "##[set-output name=version;]$(cat $(find . -name version))" - - - name: DEBUG - Print version name - shell: bash - run: | - echo "DEBUG: printing version from version file" - echo "${{ steps.version.outputs.version }}" - - - name: Publish the flatpak in a new cooker release - uses: ncipollo/release-action@v1 - with: - #tag: "${{ steps.version.outputs.version }}" - 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}}. - - 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. - - artifacts: "RetroDECK.flatpak" - allowUpdates: true - prerelease: true - draft: false - token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - repo: RetroDECK-cooker - continue-on-error: true - - - name: Compress global cache - run: | - touch retrodeck-cooker.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build - continue-on-error: true - - - name: Upload global cache - uses: actions/upload-artifact@v3 - with: - name: global-cache - path: retrodeck-cooker.tar.gz RetroDECK.flatpak - continue-on-error: true - - - name: Upload RetroDECK.flatpak - uses: actions/upload-artifact@v3 - with: - name: retrodeck-flatpak - path: RetroDECK.flatpak - continue-on-error: true diff --git a/.github/workflows/flathub_push_cooker.yml b/.github/workflows/flathub_push_cooker.yml deleted file mode 100644 index 65a4d349..00000000 --- a/.github/workflows/flathub_push_cooker.yml +++ /dev/null @@ -1,88 +0,0 @@ - -name: PUSH-cooker-flathub - -on: - workflow_dispatch: - -jobs: - - Pushing_cooker_into_flathub: - runs-on: ubuntu-latest - steps: - - name: Pushing - shell: bash - run: | - - # EDITABLES: - rd_branch=${GITHUB_REF_NAME} - 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 - - # NON-EDITABLES - #relname="$rd_branch-"$(date +%d%m%y.%H%M) - relname="cooker-"$(git rev-parse --short HEAD) - - 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 -b $relname - - 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 $relname diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 0404e018..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,188 +0,0 @@ -name: main - -on: - # Triggers the workflow on push or pull request events but only for the main branch - # push: - # branches: - # - main - # pull_request: - # branches: - # - main - - workflow_dispatch: - - -jobs: - - Job1_-_Building_P1: - runs-on: ubuntu-latest - steps: - - - name: Get date for artifacts - id: date - run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" - - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch - - - name: Generate build ID - id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" - - - uses: actions/checkout@v3 - - - name: Download global cache - uses: dawidd6/action-download-artifact@v2 - with: - workflow: main.yml - name: global-cache - search_artifacts: true - skip_unpack: true - continue-on-error: true - - - name: Extract global cache - run: | - tar --skip-old-files -xzvf retrodeck-main.tar.gz - rm -f retrodeck-main.tar.gz - continue-on-error: true - - - name: DEBUG - run: | - echo "Listing folder $PWD contents" - ls -lna - echo "Checking for version file" - find ~ -iname version - cat $(find ~ -iname version) - - - name: Initialize enviornment - run: | - git pull - 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 org.freedesktop.Sdk.Extension.llvm13 - - - name: Buld part 1 - Until melonds - run: | - sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml - - - name: Compress cache - run: | - touch retrodeck-main.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build - - - name: Upload build specific cache - uses: actions/upload-artifact@v3 - with: - name: "${{ steps.generating_buildid.outputs.build-id }}" - path: retrodeck-main.tar.gz - - # this is done to speed up the things now, it may be removed later - - name: Compress global cache - run: | - touch retrodeck-main.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build - continue-on-error: true - - - name: Upload global cache - uses: actions/upload-artifact@v3 - with: - name: global-cache - path: retrodeck-main.tar.gz RetroDECK.flatpak - continue-on-error: true - - outputs: - buildID: "${{ steps.generating_buildid.outputs.build-id }}" - - Job2_-_Build_P2_and_publish: - runs-on: ubuntu-latest - needs: [Job1_-_Building_P1] - steps: - - - uses: actions/checkout@v3 - - - name: Download build specific cache - uses: actions/download-artifact@v2 - with: - name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} - - - name: Extract cache - run: | - tar --skip-old-files -xzvf retrodeck-main.tar.gz - rm -f retrodeck-main.tar.gz - - - name: DEBUG - run: | - echo "Listing folder $PWD contents" - ls -lna - echo "Checking for version file" - find ~ -iname version - cat $(find ~ -iname version) - - - name: Initialize enviornment - run: | - git pull - 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 org.freedesktop.Sdk.Extension.llvm13 - - - name: Create Bundle - run: | - sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml - sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck - - - name: Read version from version file - id: version - run: echo "##[set-output name=version;]$(cat $(find . -name version))" - - - name: Publish the flatpak in a new main release - uses: ncipollo/release-action@v1 - with: - #tag: "${{ steps.version.outputs.version }}" - #tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" - tag: "0.4.0b" - body: | - # Release Notes (main) - - artifacts: "RetroDECK.flatpak" - allowUpdates: true - prerelease: true - draft: true - token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - repo: RetroDECK-main - continue-on-error: true - - - name: Compress global cache - run: | - touch retrodeck-main.tar.gz - rm -rf .flatpak-builder/build/*-{2,3,4,5,6} - find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks - tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build - continue-on-error: true - - - name: Upload global cache - uses: actions/upload-artifact@v3 - with: - name: global-cache - path: retrodeck-main.tar.gz RetroDECK.flatpak - continue-on-error: true - - - name: Upload RetroDECK.flatpak - uses: actions/upload-artifact@v3 - with: - name: retrodeck-flatpak - path: RetroDECK.flatpak - continue-on-error: true \ No newline at end of file diff --git a/.github/workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml deleted file mode 100644 index 84c41e8e..00000000 --- a/.github/workflows/remove-artifacts.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Remove-artifacts - -on: - #schedule: - # Every day at 1am - # - cron: '0 1 * * *' - - workflow_dispatch: - -jobs: - remove-old-artifacts: - runs-on: ubuntu-latest - timeout-minutes: 10 - - steps: - - name: Remove old artifacts - uses: c-hive/gha-remove-artifacts@v1 - with: - age: '2 seconds' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js - # Optional inputs - # skip-tags: true - # skip-recent: 5 From 3b941155cf4260b59a86b702020ad3e54e9ac838 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:12:54 +0200 Subject: [PATCH 02/76] Removed unused pipelines --- .../workflows/removed/TEST_release_info.yml | 62 ++++++ .github/workflows/removed/cooker.yml | 205 ++++++++++++++++++ .../workflows/removed/flathub_push_cooker.yml | 88 ++++++++ .github/workflows/removed/main.yml | 188 ++++++++++++++++ .../workflows/removed/remove-artifacts.yml | 22 ++ 5 files changed, 565 insertions(+) create mode 100644 .github/workflows/removed/TEST_release_info.yml create mode 100644 .github/workflows/removed/cooker.yml create mode 100644 .github/workflows/removed/flathub_push_cooker.yml create mode 100644 .github/workflows/removed/main.yml create mode 100644 .github/workflows/removed/remove-artifacts.yml diff --git a/.github/workflows/removed/TEST_release_info.yml b/.github/workflows/removed/TEST_release_info.yml new file mode 100644 index 00000000..ebf21609 --- /dev/null +++ b/.github/workflows/removed/TEST_release_info.yml @@ -0,0 +1,62 @@ +name: TEST_release_info + +on: + push: + branches: + - main + paths: + - .github/workflows/TEST_release_info.yml + pull_request: + branches: + - main + + workflow_dispatch: + + +jobs: + + Building_RetroDECK: + runs-on: ubuntu-latest + steps: + + - name: Generate build ID + id: generating_buildid + run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")" + + - uses: actions/checkout@v3 + + - name: Initialize enviornment + run: | + git pull + git submodule init + git submodule update + sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet appstream-util + + - name: Validating the appdata + run: appstream-util validate "net.retrodeck.retrodeck.appdata.xml" + continue-on-error: true + + - name: Getting version info + id: version + run: | + appdata="https://raw.githubusercontent.com/XargonWan/RetroDECK/main/net.retrodeck.retrodeck.appdata.xml" + REL_VER=$(curl -s $appdata | xmlstarlet sel -t -v "//release/@version" | head -1) + DES="$(curl -s $appdata | xmlstarlet sel -t -m "//release[1]" -v "description" -n | sed '1,2d;$d;s/^ */- /;/^- $/d')" + echo "REL_VER=$REL_VER" >> $GITHUB_ENV + echo -e "# Release Notes\n" >> "body.md" + echo "$DES" >> "body.md" + + - name: Publish the flatpak in a new release + uses: ncipollo/release-action@v1 + env: + REL_VER: ${{ env.REL_VER }} + with: + tag: ${{ env.REL_VER }} + name: "RetroDECK v${{ env.REL_VER }}" + bodyFile: "body.md" + #artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" + allowUpdates: true + draft: true + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK + #continue-on-error: true \ No newline at end of file diff --git a/.github/workflows/removed/cooker.yml b/.github/workflows/removed/cooker.yml new file mode 100644 index 00000000..ff8330e3 --- /dev/null +++ b/.github/workflows/removed/cooker.yml @@ -0,0 +1,205 @@ +name: cooker + +on: + # push: + # branches: + # - cooker* + # pull_request: + # branches: + # - cooker* + + workflow_dispatch: + + +jobs: + + Job1_-_Building_P1: + runs-on: ubuntu-latest + steps: + + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch + + - name: Generate build ID + id: generating_buildid + run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" + + - uses: actions/checkout@v3 + + - name: Download global cache + uses: dawidd6/action-download-artifact@v2 + with: + workflow: cooker.yml + name: global-cache + search_artifacts: true + skip_unpack: true + continue-on-error: true + + - name: Extract global cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz + continue-on-error: true + + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -lna + echo "Checking for version file" + find ~ -iname version + cat $(find ~ -iname version) + + - name: Initialize enviornment + run: | + git pull + 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 org.freedesktop.Sdk.Extension.llvm13 + + - name: Buld part 1 - Until melonds + run: | + sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + + - name: Compress cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build + + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: "${{ steps.generating_buildid.outputs.build-id }}" + path: retrodeck-cooker.tar.gz + + # this is done to speed up the things now, it may be removed later + - name: Compress global cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build + continue-on-error: true + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: retrodeck-cooker.tar.gz RetroDECK.flatpak + continue-on-error: true + + outputs: + buildID: "${{ steps.generating_buildid.outputs.build-id }}" + + Job2_-_Build_P2_and_publish: + runs-on: ubuntu-latest + needs: [Job1_-_Building_P1] + steps: + + - uses: actions/checkout@v3 + + - name: Download build specific cache + uses: actions/download-artifact@v2 + with: + name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} + + - name: Extract cache + run: | + tar --skip-old-files -xzvf retrodeck-cooker.tar.gz + rm -f retrodeck-cooker.tar.gz + + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -lna + echo "Checking for version file" + find ~ -iname version + cat $(find ~ -iname version) + + - name: Initialize enviornment + run: | + git pull + 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 org.freedesktop.Sdk.Extension.llvm13 + + - name: Create Bundle + run: | + sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + sudo flatpak build-bundle $GITHUB_WORKSPACE/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: Read version from version file + id: version + run: echo "##[set-output name=version;]$(cat $(find . -name version))" + + - name: DEBUG - Print version name + shell: bash + run: | + echo "DEBUG: printing version from version file" + echo "${{ steps.version.outputs.version }}" + + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + #tag: "${{ steps.version.outputs.version }}" + 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}}. + + 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. + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: false + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker + continue-on-error: true + + - name: Compress global cache + run: | + touch retrodeck-cooker.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-cooker.tar.gz retrodeck-flatpak-cooker .flatpak-builder/build + continue-on-error: true + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: retrodeck-cooker.tar.gz RetroDECK.flatpak + continue-on-error: true + + - name: Upload RetroDECK.flatpak + uses: actions/upload-artifact@v3 + with: + name: retrodeck-flatpak + path: RetroDECK.flatpak + continue-on-error: true diff --git a/.github/workflows/removed/flathub_push_cooker.yml b/.github/workflows/removed/flathub_push_cooker.yml new file mode 100644 index 00000000..65a4d349 --- /dev/null +++ b/.github/workflows/removed/flathub_push_cooker.yml @@ -0,0 +1,88 @@ + +name: PUSH-cooker-flathub + +on: + workflow_dispatch: + +jobs: + + Pushing_cooker_into_flathub: + runs-on: ubuntu-latest + steps: + - name: Pushing + shell: bash + run: | + + # EDITABLES: + rd_branch=${GITHUB_REF_NAME} + 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 + + # NON-EDITABLES + #relname="$rd_branch-"$(date +%d%m%y.%H%M) + relname="cooker-"$(git rev-parse --short HEAD) + + 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 -b $relname + + 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 $relname diff --git a/.github/workflows/removed/main.yml b/.github/workflows/removed/main.yml new file mode 100644 index 00000000..0404e018 --- /dev/null +++ b/.github/workflows/removed/main.yml @@ -0,0 +1,188 @@ +name: main + +on: + # Triggers the workflow on push or pull request events but only for the main branch + # push: + # branches: + # - main + # pull_request: + # branches: + # - main + + workflow_dispatch: + + +jobs: + + Job1_-_Building_P1: + runs-on: ubuntu-latest + steps: + + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch + + - name: Generate build ID + id: generating_buildid + run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")" + + - uses: actions/checkout@v3 + + - name: Download global cache + uses: dawidd6/action-download-artifact@v2 + with: + workflow: main.yml + name: global-cache + search_artifacts: true + skip_unpack: true + continue-on-error: true + + - name: Extract global cache + run: | + tar --skip-old-files -xzvf retrodeck-main.tar.gz + rm -f retrodeck-main.tar.gz + continue-on-error: true + + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -lna + echo "Checking for version file" + find ~ -iname version + cat $(find ~ -iname version) + + - name: Initialize enviornment + run: | + git pull + 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 org.freedesktop.Sdk.Extension.llvm13 + + - name: Buld part 1 - Until melonds + run: | + sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml + + - name: Compress cache + run: | + touch retrodeck-main.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build + + - name: Upload build specific cache + uses: actions/upload-artifact@v3 + with: + name: "${{ steps.generating_buildid.outputs.build-id }}" + path: retrodeck-main.tar.gz + + # this is done to speed up the things now, it may be removed later + - name: Compress global cache + run: | + touch retrodeck-main.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build + continue-on-error: true + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: retrodeck-main.tar.gz RetroDECK.flatpak + continue-on-error: true + + outputs: + buildID: "${{ steps.generating_buildid.outputs.build-id }}" + + Job2_-_Build_P2_and_publish: + runs-on: ubuntu-latest + needs: [Job1_-_Building_P1] + steps: + + - uses: actions/checkout@v3 + + - name: Download build specific cache + uses: actions/download-artifact@v2 + with: + name: ${{ needs.Job1_-_Building_P1.outputs.buildID }} + + - name: Extract cache + run: | + tar --skip-old-files -xzvf retrodeck-main.tar.gz + rm -f retrodeck-main.tar.gz + + - name: DEBUG + run: | + echo "Listing folder $PWD contents" + ls -lna + echo "Checking for version file" + find ~ -iname version + cat $(find ~ -iname version) + + - name: Initialize enviornment + run: | + git pull + 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 org.freedesktop.Sdk.Extension.llvm13 + + - name: Create Bundle + run: | + sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml + sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck + + - name: Read version from version file + id: version + run: echo "##[set-output name=version;]$(cat $(find . -name version))" + + - name: Publish the flatpak in a new main release + uses: ncipollo/release-action@v1 + with: + #tag: "${{ steps.version.outputs.version }}" + #tag: "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}" + tag: "0.4.0b" + body: | + # Release Notes (main) + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: true + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-main + continue-on-error: true + + - name: Compress global cache + run: | + touch retrodeck-main.tar.gz + rm -rf .flatpak-builder/build/*-{2,3,4,5,6} + find .flatpak-builder/build -xtype l -exec rm {} \; # removing dead symlinks + tar --ignore-failed-read -czvf retrodeck-main.tar.gz retrodeck-flatpak-main .flatpak-builder/build + continue-on-error: true + + - name: Upload global cache + uses: actions/upload-artifact@v3 + with: + name: global-cache + path: retrodeck-main.tar.gz RetroDECK.flatpak + continue-on-error: true + + - name: Upload RetroDECK.flatpak + uses: actions/upload-artifact@v3 + with: + name: retrodeck-flatpak + path: RetroDECK.flatpak + continue-on-error: true \ No newline at end of file diff --git a/.github/workflows/removed/remove-artifacts.yml b/.github/workflows/removed/remove-artifacts.yml new file mode 100644 index 00000000..84c41e8e --- /dev/null +++ b/.github/workflows/removed/remove-artifacts.yml @@ -0,0 +1,22 @@ +name: Remove-artifacts + +on: + #schedule: + # Every day at 1am + # - cron: '0 1 * * *' + + workflow_dispatch: + +jobs: + remove-old-artifacts: + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Remove old artifacts + uses: c-hive/gha-remove-artifacts@v1 + with: + age: '2 seconds' # ' ', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js + # Optional inputs + # skip-tags: true + # skip-recent: 5 From a75060611a141adddbe080b81892d5bea957ad9f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:13:31 +0200 Subject: [PATCH 03/76] Updated pipelines to automatically insert the branch name --- .github/workflows/cooker-selfhosted.yml | 4 ++++ .github/workflows/main-selfhosted.yml | 4 ++++ net.retrodeck.retrodeck.yml | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index f4e8838a..dedcbb9f 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -62,6 +62,10 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks + - name: Setting branch in the manifest + run: | + sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index c1a115a0..d68bcdda 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -53,6 +53,10 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks + - name: Setting branch in the manifest + run: | + sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8c32c480..84e6aa85 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,7 +66,6 @@ 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 version-initialization (first one) # [ ] change branch into main in retrodeck module (last one) @@ -91,7 +90,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.7.1b + branch: THISBRANCH - name: xmlstarlet config-opts: @@ -1235,4 +1234,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.7.1b + branch: THISBRANCH From 71d5e6f8093e30aacf91a84952675b7c9fb93c58 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:13:48 +0200 Subject: [PATCH 04/76] Updated version notes --- net.retrodeck.retrodeck.appdata.xml | 53 +++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index f1d81141..4a126254 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,15 +65,62 @@ GPL-3.0 CC0-1.0 - - https://github.com/XargonWan/RetroDECK/releases/tag/0.7.1b + + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b

Bug fixes:

    -
  • PLACEHOLDER
    • +
  • Updated ES-DE to 2.1.1
    • +
  • Redone the patches for ES-DE
    • +
  • Updated theme
    • +
  • Changelog is now scrollable
 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.1b + +

Information:

+
    +
  • Steam Deck users update RetroDECK from Discover in Desktop Mode.
    • +
  • Don't forget to reapply the latest controller layout: Go into the Templates tab and reapply the new profile ending with 0.7.1b (there is no need to reinstall the entire layout from the Configurator).
    • +
+

Bug fixes and other changes:

+
    +
  • Fixed an issue to make sure the RD controller layout file at update with each RD update.
    • +
  • Fixed an issue with PPSSPP that made L and R incorrectly bound.
    • +
  • Fixed an issue in the Configurator that prevented the Yuzu preset for swapping A/B X/Y from working.
    • +
  • Fixed a notification issue on the latest SteamOS Beta releases.
    • +
  • Fixed an rsync permissions issue in the RetroDECK Framework.
    • +
  • Updated Yuzu presets to handle new config syntax in the RetroDECK Framework.
    • +
  • Changed auto-update to notification only, until permissions error can be worked out.
    • +
  • Added some new pixelart icons by ItzSelenux (pixelitos-icon-theme)
    • +
+

Updates:

+

All Emulators and ES-DE have been updated

+

Steam Deck - Global Controller Layout:

+

We have done some changes based on community feedback

+
    +
  • Select is now a hotkey trigger while pressing it down, L4 and R4 are still triggers as well.
    • +
  • The RetroArch combo of Select + Start = Quit now works on many SA-Emulators.
    • +
  • Open Menu is removed from Select.
    • +
  • R5 = A button (this allows for great Wii controls on the right touchpad and pressing down the R5 for A).
    • +
  • L5 = B button.
    • +
+

Global hotkey changes:

+
    +
  • Open Menu is on Y.
    • +
  • Increase Emulation Speed is on Dpad-UP.
    • +
  • Decrease Emulation Speed is on Dpad-Down.
    • +
  • Fullscreen OFF command is removed (as emulators have migrated to toggle).
    • +
+

Known issues:

+
    +
  • The built-in auto-updater is not working (we are working on it). Discover is ok.
    • +
  • Some emulators don't have hotkey support or have bugs affecting their hotkeys.
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.0b From b80b95930b25fcf1e2b42e25739b2d103fe5c01c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:16:24 +0200 Subject: [PATCH 05/76] Updated pipelines [skip ci] --- .github/workflows/cooker-selfhosted.yml | 1 + .github/workflows/main-selfhosted.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index dedcbb9f..7ff0d3c2 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -65,6 +65,7 @@ jobs: - name: Setting branch in the manifest run: | sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - name: Build flatpak run: | diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index d68bcdda..d8685cf7 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -56,6 +56,7 @@ jobs: - name: Setting branch in the manifest run: | sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - name: Build flatpak run: | From fdcbaa345c449f9bac9483c2bde9ada5a7f0b697 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:30:40 +0200 Subject: [PATCH 06/76] Improved pipelines adding a version check on main [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- .github/workflows/main-selfhosted.yml | 15 ++++++++++++--- net.retrodeck.retrodeck.yml | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 7ff0d3c2..debbfb76 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -64,7 +64,7 @@ jobs: - name: Setting branch in the manifest run: | - sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - name: Build flatpak diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index d8685cf7..47381d0d 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -53,10 +53,19 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks - - name: Setting branch in the manifest + - name: Read manifest content + id: read_manifest + run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" + + - name: Check VERSION + id: check_version_string run: | - sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]]; then + echo "Version string is present, proceeding." + else + echo "Error: You forgot to specify the version." + exit 1 + fi - name: Build flatpak run: | diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 84e6aa85..aa6a1f33 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -76,7 +76,7 @@ modules: build-commands: - | - VERSION=$(git rev-parse --abbrev-ref HEAD) + VERSION=THISBRANCH git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From 3e284af91bc3981fec82c56f716e0f47b075e364 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:36:36 +0200 Subject: [PATCH 07/76] Comments [skip ci] --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index aa6a1f33..740f655b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,6 +66,7 @@ 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 version-initialization (first one) # [ ] change branch into main in retrodeck module (last one) From 1293940f781368b78564972ec68695d1afc0b31f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 25 Aug 2023 15:45:57 +0200 Subject: [PATCH 08/76] Main pipeline now updates the branches in the module [skip ci] --- .github/workflows/main-selfhosted.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 47381d0d..7cd7e44f 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -53,6 +53,11 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks + - name: Setting branch in the manifest + run: | + sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" From 2437d5c48968aa42354475d1aae4044da0cbd50a Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 25 Aug 2023 09:59:31 -0400 Subject: [PATCH 09/76] Cooker version automation --- .github/workflows/cooker-selfhosted.yml | 7 +------ .github/workflows/main-selfhosted.yml | 5 ----- automation_tools/automation_task_list.cfg | 1 + automation_tools/pre_build_automation.sh | 10 +++++++++- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index debbfb76..f10f4b27 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -62,11 +62,6 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks - - name: Setting branch in the manifest - run: | - sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - - name: Build flatpak run: | git config --global protocol.file.allow always @@ -117,4 +112,4 @@ jobs: with: name: retrodeck-flatpak path: RetroDECK.flatpak - continue-on-error: true \ No newline at end of file + continue-on-error: true diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 7cd7e44f..47381d0d 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -53,11 +53,6 @@ jobs: runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks - - name: Setting branch in the manifest - run: | - sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index f1624f43..98321389 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -1,5 +1,6 @@ # The proper format for this file is # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional) +branch^THISBRANCH # hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh index 637c3f95..f4d56c62 100644 --- a/automation_tools/pre_build_automation.sh +++ b/automation_tools/pre_build_automation.sh @@ -15,6 +15,7 @@ rd_manifest=${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml automation_task_list=${GITHUB_WORKSPACE}/automation_tools/automation_task_list.cfg +current_branch=$(git rev-parse --abbrev-ref HEAD) echo "Manifest location: $rd_manifest" echo "Automation task list location: $automation_task_list" @@ -23,10 +24,17 @@ echo "Task list contents:" cat "$automation_task_list" echo +# Update all collected information while IFS="^" read -r action placeholder url branch do if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then - if [[ "$action" == "hash" ]]; then + if [[ "$action" == "branch" ]]; then + echo + echo "Placeholder text: $placeholder" + echo "Current branch:" "$current_branch" + echo + /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' $rd_manifest + elif [[ "$action" == "hash" ]]; then echo echo "Placeholder text: $placeholder" echo "URL to hash: $url" From da870ffdc76caba8ae0e17a1f7ee6581df4589c7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 28 Aug 2023 14:58:02 +0200 Subject: [PATCH 10/76] Typo fixed [skip ci] --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 934dbffd..8de84fea 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,5 @@ Thumbs.db .flatpak-builder/ retrodeck-flatpak-cooker/ retrodeck-flatpak/ -bakcup +backup .old From c3de529b39b37f1f979139fec9903f968c0ac3ba Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 28 Aug 2023 14:58:33 +0200 Subject: [PATCH 11/76] Branches nedds to be changed anymore [skip ci] --- net.retrodeck.retrodeck.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 740f655b..8c201fb1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -68,8 +68,6 @@ modules: # UPDATE STEPS FOR MAIN: # [ ] Update the VERSION variable # [ ] Update the appdata.xml with the version number and notes - # [ ] change branch into main in version-initialization (first one) - # [ ] change branch into main in retrodeck module (last one) # [ ] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization From 2a39b8587a086d6dc48d0d0185e203be1caa9a18 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 28 Aug 2023 15:25:01 +0200 Subject: [PATCH 12/76] ES-DE: adding "emulators" system (it's a test) + general es_systems update --- .gitignore | 2 +- es-configs/es_systems.xml | 103 ++++++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 8de84fea..e98c039e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ Thumbs.db retrodeck-flatpak-cooker/ retrodeck-flatpak/ backup -.old +.old \ No newline at end of file diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 4cd68548..736fafee 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -506,6 +506,18 @@ easyrpg easyrpg + + emulators + Emulators + %ROMPATH%/emulators + .AppImage .desktop .sh + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_OS-SHELL% -c "%ROM%" + %RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%" + pcwindows + emulators + famicom Nintendo Family Computer @@ -582,6 +594,17 @@ fmtowns fmtowns +--> + gameandwatch @@ -614,6 +637,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% + gamegear gamegear @@ -699,6 +723,17 @@ genesis genesis + gx4000 Amstrad GX4000 @@ -750,6 +785,17 @@ lcdgames, gameandwatch lcdgames + lutro Lutro Game Engine @@ -1242,8 +1288,9 @@ ports Ports %ROMPATH%/ports - .desktop .sh - %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + .AppImage .desktop .sh + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_OS-SHELL% -c "%ROM%" pc, pcwindows ports @@ -1269,7 +1316,8 @@ ps3 ps3 - + + --> psp Sony PlayStation Portable @@ -1402,6 +1451,17 @@ scummvm scummvm + sega32x Sega Mega Drive 32X @@ -1733,6 +1793,17 @@ virtualboy virtualboy + x68000 x68000 @@ -1853,6 +1925,18 @@ zx81 zx81 + zxspectrum Sinclair ZX Spectrum @@ -1863,13 +1947,4 @@ zxspectrum zxspectrum - - + \ No newline at end of file From f3440cab25fb04cbf394ac28f678e515792fb535 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 28 Aug 2023 15:36:21 +0200 Subject: [PATCH 13/76] ES-DE: Updated es_find_rules.xml --- es-configs/es_find_rules.xml | 106 ++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 26 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 13dd5dc2..8990e20b 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -15,16 +15,17 @@ RetroArch-Linux-x86_64.AppImage - /var/lib/flatpak/exports/bin/org.libretro.RetroArch - ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch ~/Applications/RetroArch-Linux*.AppImage + ~/.local/share/applications/RetroArch-Linux*.AppImage ~/.local/bin/RetroArch-Linux*.AppImage ~/bin/RetroArch-Linux*.AppImage + /var/lib/flatpak/exports/bin/org.libretro.RetroArch + ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch - + /app/share/libretro/cores ~/snap/retroarch/current/.config/retroarch/cores @@ -69,11 +70,12 @@ net.cebix.basilisk - /var/lib/flatpak/exports/bin/net.cebix.basilisk - ~/.local/share/flatpak/exports/bin/net.cebix.basilisk ~/Applications/BasiliskII*.AppImage + ~/.local/share/applications/BasiliskII*.AppImage ~/.local/bin/BasiliskII*.AppImage ~/bin/BasiliskII*.AppImage + /var/lib/flatpak/exports/bin/net.cebix.basilisk + ~/.local/share/flatpak/exports/bin/net.cebix.basilisk @@ -106,9 +108,11 @@ ~/Applications/Cemu*.AppImage + ~/.local/share/applications/Cemu*.AppImage ~/.local/bin/Cemu*.AppImage ~/bin/Cemu*.AppImage ~/Applications/Cemu/Cemu + ~/.local/share/applications/Cemu/Cemu ~/.local/bin/Cemu/Cemu ~/bin/Cemu/Cemu @@ -122,6 +126,10 @@ org.citra_emu.citra + ~/Applications/citra*.AppImage + ~/.local/share/applications/citra*.AppImage + ~/.local/bin/citra*.AppImage + ~/bin/citra*.AppImage /var/lib/flatpak/exports/bin/org.citra_emu.citra ~/.local/share/flatpak/exports/bin/org.citra_emu.citra @@ -133,6 +141,7 @@ ~/Applications/cpcemu/cpcemu + ~/.local/share/applications/cpcemu/cpcemu ~/.local/bin/cpcemu/cpcemu ~/bin/cpcemu/cpcemu @@ -141,6 +150,7 @@ ~/Applications/CSpect/CSpect.exe + ~/.local/share/applications/CSpect/CSpect.exe ~/.local/bin/CSpect/CSpect.exe ~/bin/CSpect/CSpect.exe @@ -163,11 +173,12 @@ org.DolphinEmu.dolphin-emu - /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu - ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu ~/Applications/Dolphin_Emulator*.AppImage + ~/.local/share/applications/Dolphin_Emulator*.AppImage ~/.local/bin/Dolphin_Emulator*.AppImage ~/bin/Dolphin_Emulator*.AppImage + /var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu + ~/.local/share/flatpak/exports/bin/org.DolphinEmu.dolphin-emu @@ -200,14 +211,16 @@ org.duckstation.DuckStation - /var/lib/flatpak/exports/bin/org.duckstation.DuckStation - ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation ~/Applications/duckstation-nogui*.AppImage + ~/.local/share/applications/duckstation-nogui*.AppImage ~/.local/bin/duckstation-nogui*.AppImage ~/bin/duckstation-nogui*.AppImage ~/Applications/duckstation-qt*.AppImage + ~/.local/share/applications/duckstation-qt*.AppImage ~/.local/bin/duckstation-qt*.AppImage ~/bin/duckstation-qt*.AppImage + /var/lib/flatpak/exports/bin/org.duckstation.DuckStation + ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation @@ -217,6 +230,7 @@ ~/Applications/easyrpg/easyrpg-player + ~/.local/share/applications/easyrpg/easyrpg-player ~/.local/bin/easyrpg/easyrpg-player ~/bin/easyrpg/easyrpg-player @@ -228,6 +242,7 @@ ~/Applications/fbneo/fbneo + ~/.local/share/applications/fbneo/fbneo ~/.local/bin/fbneo/fbneo ~/bin/fbneo/fbneo @@ -239,11 +254,12 @@ org.flycast.Flycast - /var/lib/flatpak/exports/bin/org.flycast.Flycast - ~/.local/share/flatpak/exports/bin/org.flycast.Flycast ~/Applications/flycast*.AppImage + ~/.local/share/applications/flycast*.AppImage ~/.local/bin/flycast*.AppImage ~/bin/flycast*.AppImage + /var/lib/flatpak/exports/bin/org.flycast.Flycast + ~/.local/share/flatpak/exports/bin/org.flycast.Flycast @@ -275,11 +291,12 @@ gargoyle - /var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle - ~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle ~/Applications/Gargoyle*.AppImage + ~/.local/share/applications/Gargoyle*.AppImage ~/.local/bin/Gargoyle*.AppImage ~/bin/Gargoyle*.AppImage + /var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle + ~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle @@ -289,6 +306,7 @@ ~/Applications/gearboy/gearboy + ~/.local/share/applications/gearboy/gearboy ~/.local/bin/gearboy/gearboy ~/bin/gearboy/gearboy @@ -297,6 +315,7 @@ ~/Applications/gopher2600/gopher2600_linux_amd64 + ~/.local/share/applications/gopher2600/gopher2600_linux_amd64 ~/.local/bin/gopher2600/gopher2600_linux_amd64 ~/bin/gopher2600/gopher2600_linux_amd64 @@ -318,6 +337,7 @@ ~/Applications/hypseus-singe/hypseus.bin + ~/.local/share/applications/hypseus-singe/hypseus.bin ~/.local/bin/hypseus-singe/hypseus.bin ~/bin/hypseus-singe/hypseus.bin @@ -329,6 +349,7 @@ ~/Applications/lightspark/lightspark + ~/.local/share/applications/lightspark/lightspark ~/.local/bin/lightspark/lightspark ~/bin/lightspark/lightspark @@ -340,6 +361,7 @@ ~/Applications/linapple/linapple + ~/.local/share/applications/linapple/linapple ~/.local/bin/linapple/linapple ~/bin/linapple/linapple @@ -385,11 +407,12 @@ io.mgba.mGBA - /var/lib/flatpak/exports/bin/io.mgba.mGBA - ~/.local/share/flatpak/exports/bin/io.mgba.mGBA ~/Applications/mGBA*.AppImage + ~/.local/share/applications/mGBA*.AppImage ~/.local/bin/mGBA*.AppImage ~/bin/mGBA*.AppImage + /var/lib/flatpak/exports/bin/io.mgba.mGBA + ~/.local/share/flatpak/exports/bin/io.mgba.mGBA @@ -430,6 +453,7 @@ ~/Applications/oricutron/Oricutron + ~/.local/share/applications/oricutron/Oricutron ~/.local/bin/oricutron/Oricutron ~/bin/oricutron/Oricutron @@ -463,8 +487,8 @@ pico8 - ~/retrodeck/bios/pico-8/pico8 ~/Applications/pico-8/pico8 + ~/.local/share/applications/pico-8/pico8 ~/.local/bin/pico-8/pico8 ~/bin/pico-8/pico8 @@ -472,11 +496,12 @@ - /var/lib/flatpak/exports/bin/org.purei.Play - ~/.local/share/flatpak/exports/bin/org.purei.Play ~/Applications/Play!*.AppImage + ~/.local/share/applications/Play!*.AppImage ~/.local/bin/Play!*.AppImage ~/bin/Play!*.AppImage + /var/lib/flatpak/exports/bin/org.purei.Play + ~/.local/share/flatpak/exports/bin/org.purei.Play @@ -516,6 +541,7 @@ ~/Applications/punes/punes + ~/.local/share/applications/punes/punes ~/.local/bin/punes/punes ~/bin/punes/punes @@ -527,6 +553,7 @@ ~/Applications/redream/redream + ~/.local/share/applications/redream/redream ~/.local/bin/redream/redream ~/bin/redream/redream @@ -538,11 +565,12 @@ com.github.Rosalie241.RMG - /var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG - ~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG ~/Applications/RMG*.AppImage + ~/.local/share/applications/RMG*.AppImage ~/.local/bin/RMG*.AppImage ~/bin/RMG*.AppImage + /var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG + ~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG @@ -553,11 +581,12 @@ net.rpcs3.RPCS3 - /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 - ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 ~/Applications/rpcs3*.AppImage + ~/.local/share/applications/rpcs3*.AppImage ~/.local/bin/rpcs3*.AppImage ~/bin/rpcs3*.AppImage + /var/lib/flatpak/exports/bin/net.rpcs3.RPCS3 + ~/.local/share/flatpak/exports/bin/net.rpcs3.RPCS3 @@ -567,6 +596,7 @@ ~/Applications/ruffle/ruffle + ~/.local/share/applications/ruffle/ruffle ~/.local/bin/ruffle/ruffle ~/bin/ruffle/ruffle @@ -582,9 +612,11 @@ /var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx ~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx ~/Applications/publish/Ryujinx + ~/.local/share/applications/publish/Ryujinx ~/.local/bin/publish/Ryujinx ~/bin/publish/Ryujinx ~/Applications/publish/Ryujinx.Ava + ~/.local/share/applications/publish/Ryujinx.Ava ~/.local/bin/publish/Ryujinx.Ava ~/bin/publish/Ryujinx.Ava @@ -618,6 +650,7 @@ ~/Applications/sdl2trs/sdl2trs + ~/.local/share/applications/sdl2trs/sdl2trs ~/.local/bin/sdl2trs/sdl2trs ~/bin/sdl2trs/sdl2trs @@ -629,6 +662,7 @@ ~/Applications/SheepShaver*.AppImage + ~/.local/share/applications/SheepShaver*.AppImage ~/.local/bin/SheepShaver*.AppImage ~/bin/SheepShaver*.AppImage @@ -640,6 +674,7 @@ ~/Applications/simcoupe/simcoupe + ~/.local/share/applications/simcoupe/simcoupe ~/.local/bin/simcoupe/simcoupe ~/bin/simcoupe/simcoupe @@ -701,6 +736,7 @@ ~/Applications/Supermodel/supermodel + ~/.local/share/applications/Supermodel/supermodel ~/.local/bin/Supermodel/supermodel ~/bin/Supermodel/supermodel @@ -712,6 +748,7 @@ ~/Applications/dolphin-emu-triforce*.AppImage + ~/.local/share/applications/dolphin-emu-triforce*.AppImage ~/.local/bin/dolphin-emu-triforce*.AppImage ~/bin/dolphin-emu-triforce*.AppImage @@ -720,6 +757,7 @@ ~/Applications/tsugaru/Tsugaru_CUI + ~/.local/share/applications/tsugaru/Tsugaru_CUI ~/.local/bin/tsugaru/Tsugaru_CUI ~/bin/tsugaru/Tsugaru_CUI @@ -761,6 +799,7 @@ ~/Applications/Vita3K/Vita3K + ~/.local/share/applications/Vita3K/Vita3K ~/.local/bin/Vita3K/Vita3K ~/bin/Vita3K/Vita3K @@ -772,11 +811,12 @@ app.xemu.xemu - /var/lib/flatpak/exports/bin/app.xemu.xemu - ~/.local/share/flatpak/exports/bin/app.xemu.xemu ~/Applications/xemu*.AppImage + ~/.local/share/applications/xemu*.AppImage ~/.local/bin/xemu*.AppImage ~/bin/xemu*.AppImage + /var/lib/flatpak/exports/bin/app.xemu.xemu + ~/.local/share/flatpak/exports/bin/app.xemu.xemu @@ -786,6 +826,7 @@ ~/Applications/xroar/xroar + ~/.local/share/applications/xroar/xroar ~/.local/bin/xroar/xroar ~/bin/xroar/xroar @@ -797,11 +838,24 @@ org.yuzu_emu.yuzu - /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu - ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu ~/Applications/yuzu*.AppImage + ~/.local/share/applications/yuzu*.AppImage ~/.local/bin/yuzu*.AppImage ~/bin/yuzu*.AppImage + /var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu + ~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu + + + + + + zesarux + + + ~/Applications/ZEsarUX/zesarux + ~/.local/share/applications/ZEsarUX/zesarux + ~/.local/bin/ZEsarUX/zesarux + ~/bin/ZEsarUX/zesarux \ No newline at end of file From 7a62a5bae20b9240c16a81063c153967d5906520 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 29 Aug 2023 12:06:23 +0200 Subject: [PATCH 14/76] ES-DE: updated configs --- es-configs/es_settings.xml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 9364318d..93de24b3 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -25,6 +25,7 @@ + @@ -51,6 +52,7 @@ + @@ -73,6 +75,7 @@ + @@ -80,6 +83,7 @@ + @@ -106,9 +110,8 @@ - - + @@ -117,14 +120,20 @@ + + + + + + - + @@ -135,11 +144,11 @@ - - + + - + \ No newline at end of file From 0267e6fd63353590676c9dfebaaecf1b06ca62cb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 29 Aug 2023 14:16:35 +0200 Subject: [PATCH 15/76] ES-DE: fixed loading bar and texts colors [skip ci] --- rd-submodules/es-de/Window.cpp.patch | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/rd-submodules/es-de/Window.cpp.patch b/rd-submodules/es-de/Window.cpp.patch index 6c9301ea..c099d83b 100644 --- a/rd-submodules/es-de/Window.cpp.patch +++ b/rd-submodules/es-de/Window.cpp.patch @@ -1,22 +1,9 @@ diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-08-23 13:12:15.625292630 +0200 -+++ emulationstation-de/es-core/src/Window.cpp 2023-08-23 14:04:13.393435463 +0200 -@@ -140,7 +140,7 @@ - mSplashTextScanning = std::unique_ptr( -- mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0x777777FF)); -+ mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0xC858E6FF)); - mSplashTextPopulating = std::unique_ptr( -- mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0x777777FF)); -+ mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0xC858E6FF)); - mSplashTextReloading = std::unique_ptr( -- mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0x777777FF)); -+ mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0xC858E6FF)); - -@@ -165,3 +165,3 @@ - progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); -- progressBarRect.color = 0x777777FF; +--- emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:14:17.208301836 +0200 ++++ emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:12:37.307334069 +0200 + +@@ -181,3 +181,3 @@ + progressBarRect.barPosY += borderThickness; +- progressBarRect.color = 0x79010FFF; + progressBarRect.color = 0xC858E6FF; mProgressBarRectangles.emplace_back(progressBarRect); -@@ -978 +978,2 @@ - } -+ From 3f3f852700f4f699ad037eb0e22865745bed0213 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 10:57:38 +0200 Subject: [PATCH 16/76] Optimizing cooker pipeline --- .github/workflows/cooker-selfhosted.yml | 36 +++++++++---------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index debbfb76..75e90a08 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -30,7 +30,10 @@ jobs: run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* continue-on-error: true - - uses: actions/checkout@v3 + - name: Clone RetroDECK repo + uses: actions/checkout@v3 + with: + submodules: 'true' - name: Generate build ID run: | @@ -40,29 +43,18 @@ jobs: capitalized_word2="$(tr '[:lower:]' '[:upper:]' <<< ${word2:0:1})${word2:1}" result=$capitalized_word1$capitalized_word2 echo $result > ${GITHUB_WORKSPACE}/buildid - ls -lah ${GITHUB_WORKSPACE} # DEBUG - cat ${GITHUB_WORKSPACE}/buildid # DEBUG echo "buildid=$result" >> $GITHUB_ENV echo "VersionID is $result" - - name: Initialize environment + - name: Initialize Flatpak environment run: | - git pull - git submodule init - git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y --noninteractive \ - org.kde.Sdk//6.3 \ - org.kde.Platform//6.3 \ - org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 \ - io.qt.qtwebengine.BaseApp/x86_64/6.3 \ - org.freedesktop.Sdk.Extension.llvm13 \ - org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 \ - runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 - /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks - - name: Setting branch in the manifest + - name: Run pre-build automation tasks + run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + + - name: Set branch in the manifest run: | sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" @@ -84,7 +76,7 @@ jobs: - name: Create Bundle run: | - flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck + flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck - name: Set environment variable with current branch name run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV @@ -102,19 +94,17 @@ jobs: 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. - artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" + artifacts: "RetroDECK-cooker.flatpak,RetroDECK-Artifact.tar.gz" allowUpdates: true - #prerelease: true makeLatest: true - #draft: true token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK-cooker continue-on-error: true # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release - - name: Upload RetroDECK.flatpak + - name: Upload RetroDECK-cooker.flatpak uses: actions/upload-artifact@v3 with: name: retrodeck-flatpak - path: RetroDECK.flatpak + path: RetroDECK-cooker.flatpak continue-on-error: true \ No newline at end of file From 0172d6d21807819bd42cf39c4caeadb2a0942490 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 11:01:44 +0200 Subject: [PATCH 17/76] Adding commits list in the release notes --- .github/workflows/cooker-selfhosted.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 75e90a08..f41003fa 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -81,6 +81,16 @@ jobs: - name: Set environment variable with current branch name run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV + - name: Get commits since last release + run: | + # Get the latest release tag + LATEST_TAG=$(git describe --tags --abbrev=0) + # Get all commits since the latest release tag + COMMITS=$(git log $LATEST_TAG..HEAD --pretty=format:"- %s") + # Set the output variable + echo "::set-output name=commits::$COMMITS" + id: commits + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: @@ -89,6 +99,9 @@ jobs: # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + ## Commits since last release + ${{ steps.commits.outputs.commits }} + For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/qQcrFvaA2C) on our Discord server. Cooker channel is provided for the community to test fixes and explore new functionality. From 8b1f6a2e5d97b8e758dca1de7992c8f40977cb72 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 11:26:02 +0200 Subject: [PATCH 18/76] Pipeline: split flatpak build and download, added a second try --- .github/workflows/cooker-selfhosted.yml | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index f41003fa..c83172e4 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -59,12 +59,47 @@ jobs: sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: "Build flatpak: download only" + id: "flatpak-download" + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + + # Sometimes flatpak download fails, in this case it tries a second time + - name: "Build flatpak: download only (retry)" + if: steps.flatpak-download.outcome == 'failure' + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always mkdir -vp ${GITHUB_WORKSPACE}/local mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker - flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --disable-download \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml - name: Create Artifact for flathub run: | From 669a0b1159a3d9432ca403b482b690c4cf5bf9be Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 11:56:42 +0200 Subject: [PATCH 19/76] Cooke pipeline: change step name [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index c83172e4..bdb3782e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -35,7 +35,7 @@ jobs: with: submodules: 'true' - - name: Generate build ID + - name: Generate cooker build ID run: | word1=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) capitalized_word1="$(tr '[:lower:]' '[:upper:]' <<< ${word1:0:1})${word1:1}" From 0ab1eaa24ef54586b80f93f6dc3330b4d24c94e1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 11:59:30 +0200 Subject: [PATCH 20/76] Update main pipeline to reflect the changes in the cooker one [skip ci] --- .github/workflows/main-selfhosted.yml | 68 ++++++++++++++++++--------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 7cd7e44f..34e5392a 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -30,30 +30,20 @@ jobs: run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* continue-on-error: true - - name: Generate build ID - id: generating_buildid - run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")" - - - uses: actions/checkout@v3 + - name: Clone RetroDECK repo + uses: actions/checkout@v3 + with: + submodules: 'true' - - name: Initialize enviornment + - name: Initialize Flatpak environment run: | - git pull - git submodule init - git submodule update sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak install --user -y --noninteractive \ - org.kde.Sdk//6.3 \ - org.kde.Platform//6.3 \ - org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 \ - io.qt.qtwebengine.BaseApp/x86_64/6.3 \ - org.freedesktop.Sdk.Extension.llvm13 \ - org.freedesktop.Sdk.Extension.dotnet6/x86_64/22.08 \ - runtime/org.freedesktop.Platform.ffmpeg-full/x86_64/22.08 - /bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh # Run pre-build automation tasks - - name: Setting branch in the manifest + - name: Run pre-build automation tasks + run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + + - name: Set branch in the manifest run: | sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" @@ -72,12 +62,47 @@ jobs: exit 1 fi + - name: "Build flatpak: download only" + id: "flatpak-download" + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + + # Sometimes flatpak download fails, in this case it tries a second time + - name: "Build flatpak: download only (retry)" + if: steps.flatpak-download.outcome == 'failure' + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always mkdir -vp ${GITHUB_WORKSPACE}/local mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker - flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --disable-download \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml - name: Create Artifact for flathub run: | @@ -111,7 +136,6 @@ jobs: bodyFile: "body.md" artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" allowUpdates: true - #prerelease: true makeLatest: true token: ${{ secrets.TRIGGER_BUILD_TOKEN }} repo: RetroDECK @@ -123,4 +147,4 @@ jobs: with: name: retrodeck-flatpak path: RetroDECK.flatpak - continue-on-error: true + continue-on-error: true \ No newline at end of file From 74de88d16af478db476317dafa0ea7839ffeb58a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 14:12:52 +0200 Subject: [PATCH 21/76] cooker pipeline: Issue while generating commits list, continuing on error. --- .github/workflows/cooker-selfhosted.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index bdb3782e..61a1cdd9 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -125,6 +125,7 @@ jobs: # Set the output variable echo "::set-output name=commits::$COMMITS" id: commits + continue-on-error: true - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 570e282526e373a914851d4c05beae9075901299 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 15:09:11 +0200 Subject: [PATCH 22/76] Automated generation of flathub needed files and manifest --- .github/workflows/flathub_push_main.yml | 27 +++++++++++++--- flathub.json | 3 -- flathub.yml | 41 ------------------------- 3 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 flathub.json delete mode 100644 flathub.yml diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index 1b4bad8f..ef02c9f4 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -9,6 +9,7 @@ jobs: Pushing_main_into_flathub: runs-on: ubuntu-latest steps: + - name: Pushing shell: bash run: | @@ -47,17 +48,35 @@ jobs: # 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 + # Creating the manifest for flathub + manifest='net.retrodeck.retrodeck.yml' + sed -n '/cleanup/q;p' $gits_folder/RetroDECK/net.retrodeck.retrodeck.yml > $manifest + sed -i '/^[[:space:]]*#/d' $manifest + sed -i 's/[[:space:]]*#.*$//' $manifest + cat << EOF >> $manifest + modules: + - name: retrodeck + buildsystem: simple + build-commands: + - cp -rn files/* /app + sources: + - type: archive + url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz + sha256: __SHA__ + EOF + + cat << EOF >> flathub.json + { + "only-arches": ["x86_64"] + } + EOF # Getting latest release name # version=$(\ diff --git a/flathub.json b/flathub.json deleted file mode 100644 index 0b69b95e..00000000 --- a/flathub.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "only-arches": ["x86_64"] -} \ No newline at end of file diff --git a/flathub.yml b/flathub.yml deleted file mode 100644 index f0216f88..00000000 --- a/flathub.yml +++ /dev/null @@ -1,41 +0,0 @@ -app-id: net.retrodeck.retrodeck -runtime: org.kde.Platform -runtime-version: 5.15-22.08 -sdk: org.kde.Sdk -sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm14 # Needed for rpcs3 -base: io.qt.qtwebengine.BaseApp # Needed for Yuzu -base-version: 5.15-22.08 # Needed for Yuzu -command: retrodeck.sh - -finish-args: - - --socket=fallback-x11 - - --socket=wayland - - --socket=pulseaudio - - --share=ipc - - --share=network - - --device=all - - --filesystem=home # Needed to be able to relocate / remove / create symlink at ~/retrodeck - - --filesystem=/run/media - - --filesystem=/media - - --allow=multiarch - - --talk-name=org.freedesktop.ScreenSaver - - --talk-name=org.freedesktop.PowerManagement.Inhibit - - --talk-name=org.freedesktop.login1.Manager - - --filesystem=xdg-run/app/com.discordapp.Discord:create - # Dolphin - - --allow=bluetooth - # PPSSPP - # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows - - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck - - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck - -modules: - - name: retrodeck - buildsystem: simple - build-commands: - - cp -rn files/* /app - sources: - - type: archive - url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz - sha256: __SHA__ \ No newline at end of file From af5b12bfd842c88b0c11760318fd1633e4b34619 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 15:17:38 +0200 Subject: [PATCH 23/76] Added ReadTheDocs badge to README.md [skip ci] --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index caf4125f..fd858140 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ ![Flathub](https://img.shields.io/flathub/v/net.retrodeck.retrodeck) ![Discord](https://img.shields.io/discord/951662718102962256?label=discord) ![GitHub](https://img.shields.io/github/license/XargonWan/RetroDECK) +[![Documentation Status](https://readthedocs.org/projects/retrodeck/badge/?version=latest)](https://retrodeck.readthedocs.io/en/latest/?badge=latest) + # RetroDECK on your device! From 507ad3a73e48b6c532960cb200d9de7d62b8b778 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 30 Aug 2023 09:58:16 -0400 Subject: [PATCH 24/76] Use existing function for branch replacement --- automation_tools/automation_task_list.cfg | 2 +- automation_tools/pre_build_automation.sh | 8 +------- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index 98321389..a34f3878 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -1,6 +1,5 @@ # The proper format for this file is # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional) -branch^THISBRANCH # hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage @@ -10,3 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid +outside_info^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh index f4d56c62..cdd1c59e 100644 --- a/automation_tools/pre_build_automation.sh +++ b/automation_tools/pre_build_automation.sh @@ -28,13 +28,7 @@ echo while IFS="^" read -r action placeholder url branch do if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then - if [[ "$action" == "branch" ]]; then - echo - echo "Placeholder text: $placeholder" - echo "Current branch:" "$current_branch" - echo - /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' $rd_manifest - elif [[ "$action" == "hash" ]]; then + if [[ "$action" == "hash" ]]; then echo echo "Placeholder text: $placeholder" echo "URL to hash: $url" diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index fbfdda61..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 50314360..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From 03fc1ce56ac11c567744cfb94623d15445636161 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 16:16:20 +0200 Subject: [PATCH 25/76] pipelines: moved the branch checking from the pipeline to the automation tool --- .github/workflows/cooker-selfhosted.yml | 5 ----- .github/workflows/main-selfhosted.yml | 7 +------ automation_tools/automation_task_list.cfg | 1 + 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 61a1cdd9..fc1cd535 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -54,11 +54,6 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - - name: Set branch in the manifest - run: | - sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - - name: "Build flatpak: download only" id: "flatpak-download" run: | diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 34e5392a..5d9e8d3d 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -43,11 +43,6 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - - name: Set branch in the manifest - run: | - sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" @@ -55,7 +50,7 @@ jobs: - name: Check VERSION id: check_version_string run: | - if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]]; then + if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]] || [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=main"* ]]; then echo "Version string is present, proceeding." else echo "Error: You forgot to specify the version." diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index f1624f43..a34f3878 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -9,3 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid +outside_info^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) From 16fe569c204b9e681c853f15c55ec7cc069eecb1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 16:16:44 +0200 Subject: [PATCH 26/76] Updated release comments on manifest --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8c201fb1..ad873521 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,15 +66,15 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [ ] Update the VERSION variable + # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" # [ ] Update the appdata.xml with the version number and notes - # [ ] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization buildsystem: simple build-commands: - | + # on main please update this with the version variable, eg: VERSION='0.7.0b' VERSION=THISBRANCH git checkout ${GITHUB_REF_NAME} From 64c147374f68033c3e88716aa8e146745bb581b6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 17:18:22 +0200 Subject: [PATCH 27/76] Wrong substitution? --- automation_tools/automation_task_list.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index a34f3878..15506a58 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -9,4 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid -outside_info^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) +outside_info^THISBRANCH^"$(git rev-parse --abbrev-ref HEAD)" From fa21df195cd4d5a5f53aa126ebb347d21c2cb224 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 17:20:28 +0200 Subject: [PATCH 28/76] Some folder were excluded from the build triggering --- .github/workflows/cooker-selfhosted.yml | 2 ++ .github/workflows/main-selfhosted.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index fc1cd535..7a59bb0f 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -6,8 +6,10 @@ on: - cooker* paths: - '.github/workflows/**' + - 'automation_tools' - 'emu-configs/**' - 'es-configs/**' + - 'functions' - 'rd-submodules/**' - '*.sh' - 'net.retrodeck.retrodeck.yml' diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 5d9e8d3d..4588bb81 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -6,8 +6,10 @@ on: - main paths: - '.github/workflows/**' + - 'automation_tools' - 'emu-configs/**' - 'es-configs/**' + - 'functions' - 'rd-submodules/**' - '*.sh' - 'net.retrodeck.retrodeck.yml' From 88996afd085afbea527d01cc82aa6dc69106a715 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 17:26:16 +0200 Subject: [PATCH 29/76] pipeline: wrong substitution in autmation tools, falling back to the old method --- .github/workflows/cooker-selfhosted.yml | 6 ++++++ .github/workflows/main-selfhosted.yml | 6 ++++++ automation_tools/automation_task_list.cfg | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 7a59bb0f..1a3dca3b 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -56,6 +56,12 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + # remove me when the automations tool substitution can do this + - name: Set branch in the manifest + run: | + sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: "Build flatpak: download only" id: "flatpak-download" run: | diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 4588bb81..420a8895 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -45,6 +45,12 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + # remove me when the automations tool substitution can do this + - name: Set branch in the manifest + run: | + sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index 15506a58..74f9aae2 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -9,4 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid -outside_info^THISBRANCH^"$(git rev-parse --abbrev-ref HEAD)" +#outside_info^THISBRANCH^"$(git rev-parse --abbrev-ref HEAD)" From 221159eaebfc78628f9db99fba39dd797c4936c6 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 30 Aug 2023 11:59:58 -0400 Subject: [PATCH 30/76] Branch rename automation again --- automation_tools/automation_task_list.cfg | 2 +- automation_tools/pre_build_automation.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index a34f3878..dd907e09 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -9,4 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid -outside_info^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) +branch^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh index cdd1c59e..f4d56c62 100644 --- a/automation_tools/pre_build_automation.sh +++ b/automation_tools/pre_build_automation.sh @@ -28,7 +28,13 @@ echo while IFS="^" read -r action placeholder url branch do if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then - if [[ "$action" == "hash" ]]; then + if [[ "$action" == "branch" ]]; then + echo + echo "Placeholder text: $placeholder" + echo "Current branch:" "$current_branch" + echo + /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' $rd_manifest + elif [[ "$action" == "hash" ]]; then echo echo "Placeholder text: $placeholder" echo "URL to hash: $url" From 6c95113cfe3d955c459b8fd736a8a8f88c75ed95 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 30 Aug 2023 12:01:35 -0400 Subject: [PATCH 31/76] Remove excess info --- automation_tools/automation_task_list.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index dd907e09..ebf7d98f 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -9,4 +9,4 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid -branch^THISBRANCH^$(git rev-parse --abbrev-ref HEAD) +branch^THISBRANCH From 5e762cc056420fdff86c25286b0f13ee917c05f6 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 30 Aug 2023 12:03:03 -0400 Subject: [PATCH 32/76] Sync to main repo --- .github/workflows/cooker-selfhosted.yml | 34 ++++++++++++++++++++++++- .github/workflows/main-selfhosted.yml | 29 +++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 7042d3f0..12062858 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -32,7 +32,10 @@ jobs: run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* continue-on-error: true - - uses: actions/checkout@v3 + - name: Clone RetroDECK repo + uses: actions/checkout@v3 + with: + submodules: 'true' - name: Generate cooker build ID run: | @@ -59,6 +62,35 @@ jobs: sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: "Build flatpak: download only" + id: "flatpak-download" + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + + # Sometimes flatpak download fails, in this case it tries a second time + - name: "Build flatpak: download only (retry)" + if: steps.flatpak-download.outcome == 'failure' + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 8b3764f5..bf2fa44e 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -65,6 +65,35 @@ jobs: exit 1 fi + - name: "Build flatpak: download only" + id: "flatpak-download" + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + + # Sometimes flatpak download fails, in this case it tries a second time + - name: "Build flatpak: download only (retry)" + if: steps.flatpak-download.outcome == 'failure' + run: | + git config --global protocol.file.allow always + mkdir -vp ${GITHUB_WORKSPACE}/local + mkdir -vp ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker + flatpak-builder --user --force-clean \ + --install-deps-from=flathub \ + --install-deps-from=flathub-beta \ + --repo=${GITHUB_WORKSPACE}/local \ + --download-only \ + ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ + net.retrodeck.retrodeck.yml + - name: Build flatpak run: | git config --global protocol.file.allow always From d6e0691a70c3b6271a7c819ccd818372b7edbb49 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 18:06:49 +0200 Subject: [PATCH 33/76] Disabling substitution in the pipeline to use the automation tools --- .github/workflows/cooker-selfhosted.yml | 8 ++++---- .github/workflows/main-selfhosted.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 12062858..979d214a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -57,10 +57,10 @@ jobs: run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" # remove me when the automations tool substitution can do this - - name: Set branch in the manifest - run: | - sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + # - name: Set branch in the manifest + # run: | + # sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + # echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - name: "Build flatpak: download only" id: "flatpak-download" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index bf2fa44e..87152095 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -46,10 +46,10 @@ jobs: run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" # remove me when the automations tool substitution can do this - - name: Set branch in the manifest - run: | - sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + # - name: Set branch in the manifest + # run: | + # sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml + # echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - name: Read manifest content id: read_manifest From 97493cbb6284461a5e55d478a88880623bfc36ba Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 08:51:43 +0200 Subject: [PATCH 34/76] Added update portal in cooker releases + code cleanup [skip ci] --- .github/workflows/cooker-selfhosted.yml | 7 ++----- .github/workflows/main-selfhosted.yml | 6 ------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 979d214a..332113d0 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -56,11 +56,8 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - # remove me when the automations tool substitution can do this - # - name: Set branch in the manifest - # run: | - # sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - # echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" + - name: "Adding flatpak portal for automated updates (cooker only)" + run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml - name: "Build flatpak: download only" id: "flatpak-download" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 87152095..00a1b70c 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -45,12 +45,6 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - # remove me when the automations tool substitution can do this - # - name: Set branch in the manifest - # run: | - # sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml - # echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" - - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" From 2835ac9b3e4712da5b3d5106f6cd21cc2009b968 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 10:07:10 +0200 Subject: [PATCH 35/76] pipelines are getting the packages list from a requirement.txt [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- .github/workflows/main-selfhosted.yml | 2 +- automation_tools/requirements.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 automation_tools/requirements.txt diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 332113d0..d1164f44 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -50,7 +50,7 @@ jobs: - name: Initialize Flatpak environment run: | - sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 + sudo apt install -y $(cat 'automation_tools/requirements.txt') flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - name: Run pre-build automation tasks diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 00a1b70c..cdcbc094 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -39,7 +39,7 @@ jobs: - name: Initialize Flatpak environment run: | - sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 + sudo apt install -y $(cat 'automation_tools/requirements.txt') flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - name: Run pre-build automation tasks diff --git a/automation_tools/requirements.txt b/automation_tools/requirements.txt new file mode 100644 index 00000000..3dac54e4 --- /dev/null +++ b/automation_tools/requirements.txt @@ -0,0 +1 @@ +flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl \ No newline at end of file From a0fe34abf79f92dd5bbb018472173c132904de73 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 10:07:24 +0200 Subject: [PATCH 36/76] Updated version extractor [skip ci] --- automation_tools/version_extractor.sh | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 automation_tools/version_extractor.sh diff --git a/automation_tools/version_extractor.sh b/automation_tools/version_extractor.sh new file mode 100755 index 00000000..a76154f5 --- /dev/null +++ b/automation_tools/version_extractor.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Set the file paths +appdata="net.retrodeck.retrodeck.appdata.xml" +manifest="net.retrodeck.retrodeck.yml" +manifest_content=$(cat "$manifest") + +# Getting latest RetroDECK release info +LATEST_RELEASE=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/releases/latest") +# Extracting tag name from the latest release +TAG=$(echo "$LATEST_RELEASE" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') +# Printing results +echo "repo: $TAG" + +# Extract the version from the net.retrodeck.retrodeck.appdata.xml file +appdata_version=$(grep -oPm1 "(?<= Date: Thu, 31 Aug 2023 10:11:59 +0200 Subject: [PATCH 37/76] pipeline: moved to an install dependencies script [skip ci] --- .github/workflows/cooker-selfhosted.yml | 6 ++---- .github/workflows/main-selfhosted.yml | 6 ++---- automation_tools/install_dependencies.sh | 3 +++ automation_tools/requirements.txt | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 automation_tools/install_dependencies.sh delete mode 100644 automation_tools/requirements.txt diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index d1164f44..f106340a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -48,10 +48,8 @@ jobs: echo "buildid=$result" >> $GITHUB_ENV echo "VersionID is $result" - - name: Initialize Flatpak environment - run: | - sudo apt install -y $(cat 'automation_tools/requirements.txt') - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index cdcbc094..41792fa6 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -37,10 +37,8 @@ jobs: with: submodules: 'true' - - name: Initialize Flatpak environment - run: | - sudo apt install -y $(cat 'automation_tools/requirements.txt') - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" diff --git a/automation_tools/install_dependencies.sh b/automation_tools/install_dependencies.sh new file mode 100644 index 00000000..1f9ce4d9 --- /dev/null +++ b/automation_tools/install_dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl +flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \ No newline at end of file diff --git a/automation_tools/requirements.txt b/automation_tools/requirements.txt deleted file mode 100644 index 3dac54e4..00000000 --- a/automation_tools/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl \ No newline at end of file From f2145ae99b99a5cbd204024f4b32487b47cd374e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 10:32:40 +0200 Subject: [PATCH 38/76] renamed version checker script [skip ci] --- automation_tools/version_checker.sh | 62 +++++++++++++++++++++++++++ automation_tools/version_extractor.sh | 31 -------------- 2 files changed, 62 insertions(+), 31 deletions(-) create mode 100755 automation_tools/version_checker.sh delete mode 100755 automation_tools/version_extractor.sh diff --git a/automation_tools/version_checker.sh b/automation_tools/version_checker.sh new file mode 100755 index 00000000..a16e163f --- /dev/null +++ b/automation_tools/version_checker.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# This script is used to check that the versions are correct and topping the pipeline if something is wrong. +# This is designed to be run on main pipeline to check that everything is in order before building RetroDECK. + +# Set the file paths +appdata="net.retrodeck.retrodeck.appdata.xml" +manifest="net.retrodeck.retrodeck.yml" +manifest_content=$(cat "$manifest") + +compare_versions() { + local manifest_version_cleaned=$(echo "$1" | sed 's/[a-zA-Z]//g') + local appdata_version_cleaned=$(echo "$2" | sed 's/[a-zA-Z]//g') + + if [[ "$manifest_version_cleaned" == "$appdata_version_cleaned" ]]; then + return 0 # Versions are equal + fi + + local IFS=. + local manifest_parts=($manifest_version_cleaned) + local appdata_parts=($appdata_version_cleaned) + + for ((i=0; i<${#manifest_parts[@]}; i++)); do + if ((manifest_parts[i] > appdata_parts[i])); then + return 1 # Manifest version is greater + elif ((manifest_parts[i] < appdata_parts[i])); then + return 2 # Appdata version is greater + fi + done + + return 0 # Versions are equal +} + +# Getting latest RetroDECK release info +LATEST_RELEASE=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/releases/latest") +# Extracting tag name from the latest release +repo_version=$(echo "$LATEST_RELEASE" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') +# Printing results +echo -e "Online repository:\t$repo_version" + +# Extract the version from the net.retrodeck.retrodeck.appdata.xml file +appdata_version=$(grep -oPm1 "(?<= Date: Thu, 31 Aug 2023 10:32:51 +0200 Subject: [PATCH 39/76] comments [skip ci] --- automation_tools/install_dependencies.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation_tools/install_dependencies.sh b/automation_tools/install_dependencies.sh index 1f9ce4d9..e4cc6261 100644 --- a/automation_tools/install_dependencies.sh +++ b/automation_tools/install_dependencies.sh @@ -1,3 +1,5 @@ #!/bin/bash +# This scritp is installing the required dependencies to correctly run the pipeline and buold the flatpak + sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \ No newline at end of file From 012a06a156007bd19674815ea5764d0f5aab892a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 11:07:00 +0200 Subject: [PATCH 40/76] Split version checler and version extractor[skip ci] --- automation_tools/version_checker.sh | 45 ++++++++++++++------------- automation_tools/version_extractor.sh | 24 ++++++++++++++ 2 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 automation_tools/version_extractor.sh diff --git a/automation_tools/version_checker.sh b/automation_tools/version_checker.sh index a16e163f..8190637c 100755 --- a/automation_tools/version_checker.sh +++ b/automation_tools/version_checker.sh @@ -1,6 +1,8 @@ #!/bin/bash # This script is used to check that the versions are correct and topping the pipeline if something is wrong. -# This is designed to be run on main pipeline to check that everything is in order before building RetroDECK. +# This is designed to be run on the main pipeline to check that everything is in order before building RetroDECK. + +source automation_tools/version_extractor.sh # Set the file paths appdata="net.retrodeck.retrodeck.appdata.xml" @@ -30,33 +32,32 @@ compare_versions() { return 0 # Versions are equal } -# Getting latest RetroDECK release info -LATEST_RELEASE=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/releases/latest") -# Extracting tag name from the latest release -repo_version=$(echo "$LATEST_RELEASE" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') -# Printing results +repo_version=$(fetch_repo_version) echo -e "Online repository:\t$repo_version" -# Extract the version from the net.retrodeck.retrodeck.appdata.xml file -appdata_version=$(grep -oPm1 "(?<= Date: Thu, 31 Aug 2023 11:07:14 +0200 Subject: [PATCH 41/76] main pipeline is now checking the version [skip ci] --- .github/workflows/main-selfhosted.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 41792fa6..7647f6ef 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -47,15 +47,9 @@ jobs: id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" - - name: Check VERSION + - name: Check versions (main only) id: check_version_string - run: | - if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]] || [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=main"* ]]; then - echo "Version string is present, proceeding." - else - echo "Error: You forgot to specify the version." - exit 1 - fi + run: "automation_tools/version_checker.sh" - name: "Build flatpak: download only" id: "flatpak-download" From 60f228961af7f223cfe3bfdefbfcca7b84b62e9a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 12:40:15 +0200 Subject: [PATCH 42/76] removed unused dependency [skip ci] --- automation_tools/install_dependencies.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 automation_tools/install_dependencies.sh diff --git a/automation_tools/install_dependencies.sh b/automation_tools/install_dependencies.sh old mode 100644 new mode 100755 From 156730bedaa8ecfb88d59e1afbbe926537da8241 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 12:40:38 +0200 Subject: [PATCH 43/76] fixed version extractor: variables were missing --- automation_tools/version_extractor.sh | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 automation_tools/version_extractor.sh diff --git a/automation_tools/version_extractor.sh b/automation_tools/version_extractor.sh old mode 100644 new mode 100755 index e672575c..f324c106 --- a/automation_tools/version_extractor.sh +++ b/automation_tools/version_extractor.sh @@ -1,5 +1,9 @@ #!/bin/bash +appdata="net.retrodeck.retrodeck.appdata.xml" +manifest="net.retrodeck.retrodeck.yml" +manifest_content=$(cat "$manifest") + fetch_repo_version(){ # Getting latest RetroDECK release info LATEST_RELEASE=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/releases/latest") From 42d6d26a19b1e1d29c66fe7e2042151b2fe96e15 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 12:41:25 +0200 Subject: [PATCH 44/76] Added an aoutomation tool to manage the appdata's version notes --- automation_tools/appdata_management.sh | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 automation_tools/appdata_management.sh diff --git a/automation_tools/appdata_management.sh b/automation_tools/appdata_management.sh new file mode 100755 index 00000000..5a546595 --- /dev/null +++ b/automation_tools/appdata_management.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +source automation_tools/version_extractor.sh + +# Fetch appdata version +appdata_version=$(fetch_appdata_version) +echo -e "Appdata:\t\t$appdata_version" +# Fetch manifest version +manifest_version=$(fetch_manifest_version) +echo -e "Manifest:\t\t$manifest_version" + +# Defining manifest file location +appdata_file="net.retrodeck.retrodeck.appdata.xml" + +# Check if release with manifest_version already exists +if grep -q "version=\"$manifest_version\"" "$appdata_file"; then + echo "The release notes for the latest version are already present in the appdata" +else + # Get today's date in the required format (YYYY-MM-DD) + today_date=$(date +"%Y-%m-%d") + echo "Today is $today_date" + + # Construct the release snippet + release_snippet="\ + + + https://github.com/XargonWan/RetroDECK/releases/tag/$manifest_version + + RELEASE_NOTES_PLACEHOLDER + + " + + # Read the entire content of the XML file + xml_content=$(cat "$appdata_file") + + # Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes + # TODO + + # Append the new release snippet to the content + modified_xml_content="${xml_content//$release_snippet}" + + # Overwrite the original XML file with the modified content + echo "$modified_xml_content" > "$appdata_file" +fi + # Format the XML file + xmlstarlet fo --omit-decl "$appdata_file" \ No newline at end of file From 0bd0bbfffd10b2d77ccf1a76623ef9e19c4257ae Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 14:25:57 +0200 Subject: [PATCH 45/76] pipeline nehancements --- .github/workflows/cooker-selfhosted.yml | 9 ++++++--- .github/workflows/main-selfhosted.yml | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index f106340a..9d527f27 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -37,6 +37,9 @@ jobs: with: submodules: 'true' + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" + - name: Generate cooker build ID run: | word1=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) @@ -48,15 +51,15 @@ jobs: echo "buildid=$result" >> $GITHUB_ENV echo "VersionID is $result" - - name: "Install dependencies" - run: "automation_tools/install_dependencies.sh" - - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - name: "Adding flatpak portal for automated updates (cooker only)" run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml + - name: "Updating release notes in appdata" + run: "automation_tools/appdata_management.sh" + - name: "Build flatpak: download only" id: "flatpak-download" run: | diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 7647f6ef..d7808765 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -46,6 +46,9 @@ jobs: - name: Read manifest content id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" + + - name: "Updating release notes in appdata" + run: "automation_tools/appdata_management.sh" - name: Check versions (main only) id: check_version_string From 08698cf63a320f89143676d911dd1f0239fb614b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 14:28:57 +0200 Subject: [PATCH 46/76] Removed appdata updater as it's broken --- .github/workflows/cooker-selfhosted.yml | 4 ++-- .github/workflows/main-selfhosted.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 9d527f27..e5e1aa4d 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -57,8 +57,8 @@ jobs: - name: "Adding flatpak portal for automated updates (cooker only)" run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml - - name: "Updating release notes in appdata" - run: "automation_tools/appdata_management.sh" + # - name: "Updating release notes in appdata" + # run: "automation_tools/appdata_management.sh" - name: "Build flatpak: download only" id: "flatpak-download" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index d7808765..e1c3d448 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -47,8 +47,8 @@ jobs: id: read_manifest run: echo "::set-output name=file_content::$(cat net.retrodeck.retrodeck.yml)" - - name: "Updating release notes in appdata" - run: "automation_tools/appdata_management.sh" + # - name: "Updating release notes in appdata" + # run: "automation_tools/appdata_management.sh" - name: Check versions (main only) id: check_version_string From aa2a2b453b1b456b38e55cd880327a3030455492 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 14:32:36 +0200 Subject: [PATCH 47/76] Repo cleanup [skip ci] --- automation_tools/appdata_management.sh | 129 ++++++++++++++---- .../force-update-submodules.sh | 2 + automation_tools/pre_build_automation.sh | 0 .../removed-modules.yml | 0 .../workflows}/TEST_release_info.yml | 0 .../removed => old/workflows}/cooker.yml | 0 .../workflows}/flathub_push_cooker.yml | 0 .../removed => old/workflows}/main.yml | 0 .../workflows}/remove-artifacts.yml | 0 9 files changed, 107 insertions(+), 24 deletions(-) rename force-update-submodules.sh => automation_tools/force-update-submodules.sh (93%) mode change 100644 => 100755 automation_tools/pre_build_automation.sh rename removed-modules.yml => old/removed-modules.yml (100%) rename {.github/workflows/removed => old/workflows}/TEST_release_info.yml (100%) rename {.github/workflows/removed => old/workflows}/cooker.yml (100%) rename {.github/workflows/removed => old/workflows}/flathub_push_cooker.yml (100%) rename {.github/workflows/removed => old/workflows}/main.yml (100%) rename {.github/workflows/removed => old/workflows}/remove-artifacts.yml (100%) diff --git a/automation_tools/appdata_management.sh b/automation_tools/appdata_management.sh index 5a546595..29fa7cf5 100755 --- a/automation_tools/appdata_management.sh +++ b/automation_tools/appdata_management.sh @@ -5,42 +5,123 @@ source automation_tools/version_extractor.sh # Fetch appdata version appdata_version=$(fetch_appdata_version) echo -e "Appdata:\t\t$appdata_version" -# Fetch manifest version -manifest_version=$(fetch_manifest_version) -echo -e "Manifest:\t\t$manifest_version" # Defining manifest file location appdata_file="net.retrodeck.retrodeck.appdata.xml" -# Check if release with manifest_version already exists -if grep -q "version=\"$manifest_version\"" "$appdata_file"; then - echo "The release notes for the latest version are already present in the appdata" -else - # Get today's date in the required format (YYYY-MM-DD) - today_date=$(date +"%Y-%m-%d") - echo "Today is $today_date" +# Check if release with appdata_version already exists +if grep -q "version=\"$appdata_version\"" "$appdata_file"; then + echo "Deleting existing release version $appdata_version..." + + # Remove the existing release entry + sed -i "//d" "$appdata_file" +fi - # Construct the release snippet - release_snippet="\ +echo "Adding new release version $appdata_version..." + +# Get today's date in the required format (YYYY-MM-DD) +today_date=$(date +"%Y-%m-%d") +echo "Today is $today_date" + +# Construct the release snippet +release_snippet="\ - - https://github.com/XargonWan/RetroDECK/releases/tag/$manifest_version + + https://github.com/XargonWan/RetroDECK/releases/tag/$appdata_version RELEASE_NOTES_PLACEHOLDER " - # Read the entire content of the XML file - xml_content=$(cat "$appdata_file") +# Read the entire content of the XML file +xml_content=$(cat "$appdata_file") - # Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes - # TODO +# Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes +# TODO +git clone https://github.com/XargonWan/RetroDECK.wiki.git /tmp/wiki - # Append the new release snippet to the content - modified_xml_content="${xml_content//$release_snippet}" +# Path to the markdown file +wiki="/tmp/wiki/Version-history:-Patch-Notes.md" +# Read the markdown file until the first occurrence of "---" +latest_version_notes="" +while IFS= read -r line; do + if [ "$line" = "---" ]; then + break + fi + latest_version_notes+="$line\n" +done < "$wiki" - # Overwrite the original XML file with the modified content - echo "$modified_xml_content" > "$appdata_file" +# Extract the version number +version_number="${latest_version_notes#*# RetroDECK }" # Remove text before "# RetroDECK " +version_number="${version_number%% -*}" # Remove text after " - " + +# Extract sections from the latest version notes +sections=$(echo "$latest_version_notes" | awk '/##/ { print; }') + +# # Create a formatted section list +# section_list="" +# current_section="" +# while IFS= read -r line; do +# if [[ "$line" == "##"* ]]; then +# if [ -n "$current_section" ]; then +# section_list+="" +# fi +# section_name="${line##*# }" +# section_list+="

${section_name}

    " +# elif [[ "$line" == "- "* ]]; then +# entry="${line#*- }" +# section_list+="
  • ${entry}
    • " +# fi +# done <<< "$sections" + +# if [ -n "$current_section" ]; then +# section_list+="
" +# fi + +altered_sections="" +current_section="" +in_list=0 + +IFS=$'\n' +for line in $sections; do + if [[ $line =~ ^##\ (.+) ]]; then + if [ -n "$current_section" ]; then + if [ $in_list -eq 1 ]; then + altered_sections+="\n" + in_list=0 + fi + altered_sections+="\n" + fi + current_section="${BASH_REMATCH[1]}" + altered_sections+="

$current_section

\n
    \n" + elif [[ $line =~ ^-\ (.+) ]]; then + if [ $in_list -eq 0 ]; then + in_list=1 + altered_sections+="
      \n" + fi + list_item="${BASH_REMATCH[1]}" + altered_sections+="
    • $list_item
      • \n" + elif [ -z "$line" ]; then + if [ $in_list -eq 1 ]; then + in_list=0 + altered_sections+="
    \n" + fi + fi +done +if [ $in_list -eq 1 ]; then + altered_sections+="
\n" fi - # Format the XML file - xmlstarlet fo --omit-decl "$appdata_file" \ No newline at end of file + +echo -e "$altered_sections" + +# Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes +release_description="${release_snippet/RELEASE_NOTES_PLACEHOLDER/$section_list}" + +# Append the new release snippet to the content +modified_xml_content="${xml_content//$release_description}" + +# Overwrite the original XML file with the modified content +echo "$modified_xml_content" > "$appdata_file" + +# Format the XML file +#xmlstarlet fo --omit-decl "$appdata_file" diff --git a/force-update-submodules.sh b/automation_tools/force-update-submodules.sh similarity index 93% rename from force-update-submodules.sh rename to automation_tools/force-update-submodules.sh index 57d3df5f..c0c84f46 100644 --- a/force-update-submodules.sh +++ b/automation_tools/force-update-submodules.sh @@ -1,5 +1,7 @@ #!/bin/bash +# Don't use this script lightly + git submodule deinit --all rm rd-submodules/retroarch git rm -rf --cached rd-submodules/retroarch diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh old mode 100644 new mode 100755 diff --git a/removed-modules.yml b/old/removed-modules.yml similarity index 100% rename from removed-modules.yml rename to old/removed-modules.yml diff --git a/.github/workflows/removed/TEST_release_info.yml b/old/workflows/TEST_release_info.yml similarity index 100% rename from .github/workflows/removed/TEST_release_info.yml rename to old/workflows/TEST_release_info.yml diff --git a/.github/workflows/removed/cooker.yml b/old/workflows/cooker.yml similarity index 100% rename from .github/workflows/removed/cooker.yml rename to old/workflows/cooker.yml diff --git a/.github/workflows/removed/flathub_push_cooker.yml b/old/workflows/flathub_push_cooker.yml similarity index 100% rename from .github/workflows/removed/flathub_push_cooker.yml rename to old/workflows/flathub_push_cooker.yml diff --git a/.github/workflows/removed/main.yml b/old/workflows/main.yml similarity index 100% rename from .github/workflows/removed/main.yml rename to old/workflows/main.yml diff --git a/.github/workflows/removed/remove-artifacts.yml b/old/workflows/remove-artifacts.yml similarity index 100% rename from .github/workflows/removed/remove-artifacts.yml rename to old/workflows/remove-artifacts.yml From 2b450ad5e12d81c0c60667b4adce3ae814d21a53 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 14:43:38 +0200 Subject: [PATCH 48/76] Uploading last version of this broken tool [skip ci] --- automation_tools/appdata_management.sh | 64 ++++++-------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/automation_tools/appdata_management.sh b/automation_tools/appdata_management.sh index 29fa7cf5..a59fdfb9 100755 --- a/automation_tools/appdata_management.sh +++ b/automation_tools/appdata_management.sh @@ -58,61 +58,25 @@ version_number="${version_number%% -*}" # Remove text after " - " # Extract sections from the latest version notes sections=$(echo "$latest_version_notes" | awk '/##/ { print; }') -# # Create a formatted section list -# section_list="" -# current_section="" -# while IFS= read -r line; do -# if [[ "$line" == "##"* ]]; then -# if [ -n "$current_section" ]; then -# section_list+="" -# fi -# section_name="${line##*# }" -# section_list+="

${section_name}

    " -# elif [[ "$line" == "- "* ]]; then -# entry="${line#*- }" -# section_list+="
  • ${entry}
    • " -# fi -# done <<< "$sections" - -# if [ -n "$current_section" ]; then -# section_list+="
" -# fi - -altered_sections="" +# Create a formatted section list +section_list="" current_section="" -in_list=0 - -IFS=$'\n' -for line in $sections; do - if [[ $line =~ ^##\ (.+) ]]; then +while IFS= read -r line; do + if [[ "$line" == "##"* ]]; then if [ -n "$current_section" ]; then - if [ $in_list -eq 1 ]; then - altered_sections+="\n" - in_list=0 - fi - altered_sections+="\n" - fi - current_section="${BASH_REMATCH[1]}" - altered_sections+="

$current_section

\n
    \n" - elif [[ $line =~ ^-\ (.+) ]]; then - if [ $in_list -eq 0 ]; then - in_list=1 - altered_sections+="
      \n" - fi - list_item="${BASH_REMATCH[1]}" - altered_sections+="
    • $list_item
      • \n" - elif [ -z "$line" ]; then - if [ $in_list -eq 1 ]; then - in_list=0 - altered_sections+="
    \n" + section_list+="
" fi + section_name="${line##*# }" + section_list+="

${section_name}

    " + elif [[ "$line" == "- "* ]]; then + entry="${line#*- }" + section_list+="
  • ${entry}
    • " fi -done -if [ $in_list -eq 1 ]; then - altered_sections+="
\n" -fi +done <<< "$sections" -echo -e "$altered_sections" +if [ -n "$current_section" ]; then + section_list+="" +fi # Replace RELEASE_NOTES_PLACEHOLDER with the actual release notes release_description="${release_snippet/RELEASE_NOTES_PLACEHOLDER/$section_list}" From 1ee2cb6d89d3a212a7df177aeac7f2abb40496a4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 17:26:29 +0200 Subject: [PATCH 49/76] Renamed pipelines [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 +- .github/workflows/flathub_push_main.yml | 2 +- .github/workflows/main-selfhosted.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index e5e1aa4d..4e74e67b 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -1,4 +1,4 @@ -name: cooker-selfhosted +name: "Build cooker" on: push: diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index ef02c9f4..7e085521 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -1,5 +1,5 @@ -name: PUSH-main-flathub +name: "Push main on Flathub" on: workflow_dispatch: diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index e1c3d448..d097cb7a 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -1,4 +1,4 @@ -name: main-selfhosted +name: "Build main" on: push: From c2af92576ad555fd0d2c7282a9b793a384f3aaf6 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 1 Sep 2023 16:17:57 -0400 Subject: [PATCH 50/76] Updated GBA borders preset for integer scaling --- .../defaults/retrodeck/presets/gba_presets.cfg | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg index dc48d86d..adde1c14 100644 --- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg @@ -2,12 +2,13 @@ config_file_format^retroarch target_file^/var/config/retroarch/config/mGBA/gba.cfg defaults_file^$emuconfigs/retroarch/retroarch.cfg change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_height^600 -change^borders^custom_viewport_width^900 -change^borders^custom_viewport_x^190 -change^borders^custom_viewport_y^37 -change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.105000 +change^borders^custom_viewport_height^640 +change^borders^custom_viewport_width^960 +change^borders^custom_viewport_x^160 +change^borders^custom_viewport_y^0 change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.140000 +change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg +change^borders^input_overlay_aspect_adjust_landscape^0.135000 +change^borders^input_overlay_scale_landscape^1.190000 +change^borders^input_overlay_y_offset_landscape^0.025000 enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp From 9486d7e2a8c1a1d7f7837e98d89f8f324710f844 Mon Sep 17 00:00:00 2001 From: WallK Date: Sat, 2 Sep 2023 16:53:23 +0300 Subject: [PATCH 51/76] Update GBA border to better align with integer scaling Moved and rescaled overlay to avoid covering the game --- emu-configs/defaults/retrodeck/presets/gba_presets.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg index adde1c14..21787a86 100644 --- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg @@ -8,7 +8,7 @@ change^borders^custom_viewport_x^160 change^borders^custom_viewport_y^0 change^borders^input_overlay_enable^true change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg -change^borders^input_overlay_aspect_adjust_landscape^0.135000 -change^borders^input_overlay_scale_landscape^1.190000 -change^borders^input_overlay_y_offset_landscape^0.025000 +change^borders^input_overlay_aspect_adjust_landscape^0.110000 +change^borders^input_overlay_scale_landscape^1.2150000 +change^borders^input_overlay_y_offset_landscape^0.020000 enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp From 74e7dba40ec752f9020d8cbb7dbc27736cfca735 Mon Sep 17 00:00:00 2001 From: WallK Date: Sun, 3 Sep 2023 12:28:02 +0300 Subject: [PATCH 52/76] Game Gear integer scaling and border Output resolution set to 6x by 5x to match GG screen stretch --- .../defaults/retrodeck/presets/gg_presets.cfg | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg index 1fc0ebb7..f6b8529a 100644 --- a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg @@ -2,10 +2,12 @@ config_file_format^retroarch target_file^/var/config/retroarch/config/Genesis Plus GX/gg.cfg defaults_file^$emuconfigs/retroarch/retroarch.cfg change^borders^aspect_ratio_index^23 -change^borders^custom_viewport_width^800 -change^borders^custom_viewport_x^240 -change^borders^custom_viewport_y^43 +change^borders^custom_viewport_width^960 +change^borders^custom_viewport_height^720 +change^borders^custom_viewport_x^160 +change^borders^custom_viewport_y^24 change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gg.cfg -change^borders^input_overlay_aspect_adjust_landscape^-0.080000 +change^borders^input_overlay_aspect_adjust_landscape^0.110000 change^borders^input_overlay_enable^true -change^borders^input_overlay_scale_landscape^1.345000 +change^borders^input_overlay_scale_landscape^1.350000 +change^borders^input_overlay_y_offset_landscape^0.020000 From bd39e29b6a4034703f22310d55f96224e806106d Mon Sep 17 00:00:00 2001 From: WallK Date: Sun, 3 Sep 2023 15:08:12 +0300 Subject: [PATCH 53/76] Fix GBC overlay position --- emu-configs/defaults/retrodeck/presets/gbc_presets.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg index c691b38d..cd24b9e7 100644 --- a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg @@ -10,5 +10,5 @@ change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gbc. change^borders^input_overlay_aspect_adjust_landscape^0.110000 change^borders^input_overlay_enable^true change^borders^input_overlay_scale_landscape^1.205000 -change^borders^input_overlay_y_offset_landscape^0.005000 +change^borders^input_overlay_y_offset_landscape^-0.040000 enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp From db6dde2c353d35ad18243d84826f79d0b3077582 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Sep 2023 12:05:01 +0200 Subject: [PATCH 54/76] Updating credits [skip ci] --- .../reference_lists/retrodeck_credits.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/emu-configs/defaults/retrodeck/reference_lists/retrodeck_credits.txt b/emu-configs/defaults/retrodeck/reference_lists/retrodeck_credits.txt index 46e31fbd..eb6c994b 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/retrodeck_credits.txt +++ b/emu-configs/defaults/retrodeck/reference_lists/retrodeck_credits.txt @@ -13,11 +13,14 @@ Creator of the RetroDECK configurator and various awesome features. Lazorne Community management/outreach, testing, documentation, feature suggestions and some design. +dottormac +Beta Tester + +LX32 +Junior code contributor, Beta Tester + Collaborators -Niroku / Atari -Helps with community management, is also part of Batocera - Leon Styhre Maker of EmulationStation Desktop Edition @@ -27,7 +30,7 @@ Theme creator for ES-DE and AmberELEC Additional credits RavenKilit -Did some code and testning, contributed to AmberELEC +Former Beta Tester and AmberELEC contributor MorGuux Made the RetroDECK steamdb graphics for the old logo @@ -38,11 +41,14 @@ Made the new logo and steamdb graphics teotwaki Generous cloud hosting sponsor +Niroku / Atari +Helps with community management, is also part of Batocera + Gabeboii Webmaster Draco -Server Administration +Former server admiistrator and code consultant ItzSelenux Maker of pixelitos @@ -56,7 +62,7 @@ Special Thanks We want give special thanks to: Our Patreons that keeps the build servers running and provide feedback. - All related emulation projects. + All related emulation projects, such as Batocera and AmberELEC where we are taking our inspiration. All people that have put both time and money into emulation projects. All the users who help others with support, guidance and good spirit. All the users who help with testing and reporting issues. From b93a6f4b0e1d1dc00abe2eeba705fcc710eda0a7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Sep 2023 14:48:58 +0200 Subject: [PATCH 55/76] GB: possible "quit" colorization fix --- emu-configs/defaults/retroarch/retroarch-core-options.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/emu-configs/defaults/retroarch/retroarch-core-options.cfg b/emu-configs/defaults/retroarch/retroarch-core-options.cfg index 6be315ae..f7bbfc46 100644 --- a/emu-configs/defaults/retroarch/retroarch-core-options.cfg +++ b/emu-configs/defaults/retroarch/retroarch-core-options.cfg @@ -286,6 +286,10 @@ gambatte_gb_link_network_server_ip_9 = "0" gambatte_gb_palette_pixelshift_1 = "PixelShift 01 - Arctic Green" gambatte_gb_palette_twb64_1 = "TWB64 001 - Aqours Blue" gambatte_gb_palette_twb64_2 = "TWB64 101 - 765PRO Pink" +gambatte_gb_input_player1_l = "nul" +gambatte_gb_input_player1_l_btn = "nul" +gambatte_gb_input_player1_r = "nul" +gambatte_gb_input_player1_r_btn = "nul" gambatte_gbc_color_correction = "GBC only" gambatte_gbc_color_correction_mode = "accurate" gambatte_gbc_frontlight_position = "central" From db59cde08d728f71abac6a04e673270a6738db76 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Sep 2023 15:05:30 +0200 Subject: [PATCH 56/76] Fix: cooker updater --- functions/checks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/checks.sh b/functions/checks.sh index 227be3fd..710fd6c9 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -83,7 +83,7 @@ check_for_version_update() { local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/') mkdir -p "$rdhome/RetroDECK_Updates" wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download - flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK.flatpak" + flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK-cooker.flatpak" rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ From 45cca6a765d5eb097ed7fe3918fe5bd0422a2ecc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Sep 2023 15:10:12 +0200 Subject: [PATCH 57/76] Fix: pipelines triggering [skip ci] --- .github/workflows/cooker-selfhosted.yml | 4 ++-- .github/workflows/main-selfhosted.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 4e74e67b..f198a60e 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -6,10 +6,10 @@ on: - cooker* paths: - '.github/workflows/**' - - 'automation_tools' + - 'automation_tools/**' - 'emu-configs/**' - 'es-configs/**' - - 'functions' + - 'functions/**' - 'rd-submodules/**' - '*.sh' - 'net.retrodeck.retrodeck.yml' diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index d097cb7a..ab6fa4e8 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -6,10 +6,10 @@ on: - main paths: - '.github/workflows/**' - - 'automation_tools' + - 'automation_tools/**' - 'emu-configs/**' - 'es-configs/**' - - 'functions' + - 'functions/**' - 'rd-submodules/**' - '*.sh' - 'net.retrodeck.retrodeck.yml' From 39a20a2911096f46ddcafa2cfefaa268e55c042a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Sep 2023 16:11:13 +0200 Subject: [PATCH 58/76] Fix: pipelines download retry --- .github/workflows/cooker-selfhosted.yml | 1 + .github/workflows/main-selfhosted.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index f198a60e..bf7e76fd 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -73,6 +73,7 @@ jobs: --download-only \ ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ net.retrodeck.retrodeck.yml + continue-on-error: true # Sometimes flatpak download fails, in this case it tries a second time - name: "Build flatpak: download only (retry)" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index ab6fa4e8..c380622f 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -67,6 +67,7 @@ jobs: --download-only \ ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker \ net.retrodeck.retrodeck.yml + continue-on-error: true # Sometimes flatpak download fails, in this case it tries a second time - name: "Build flatpak: download only (retry)" From 7edfc10a5ee7b435e0fad0c6ae8e0563101c6b55 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 5 Sep 2023 14:04:16 -0400 Subject: [PATCH 59/76] Update all presets on any reset/move --- functions/prepare_emulator.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index 1b24b608..441cc6b6 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -15,14 +15,14 @@ prepare_emulator() { if [[ "$emulator" == "retrodeck" ]]; then if [[ "$action" == "reset" ]]; then # Update the paths of all folders in retrodeck.cfg and create them - while read -r config_line; do - local current_setting_name=$(get_setting_name "$config_line" "retrodeck") - if [[ ! $current_setting_name =~ (rdhome|sdcard) ]]; then # Ignore these locations - local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "paths") - eval "$current_setting_name=$rdhome/$(basename $current_setting_value)" - mkdir -p "$rdhome/$(basename $current_setting_value)" - fi - done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f') + while read -r config_line; do + local current_setting_name=$(get_setting_name "$config_line" "retrodeck") + if [[ ! $current_setting_name =~ (rdhome|sdcard) ]]; then # Ignore these locations + local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "paths") + eval "$current_setting_name=$rdhome/$(basename $current_setting_value)" + mkdir -p "$rdhome/$(basename $current_setting_value)" + fi + done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f') fi if [[ "$action" == "postmove" ]]; then # Update the paths of any folders that came with the retrodeck folder during a move while read -r config_line; do @@ -616,4 +616,7 @@ prepare_emulator() { set_setting_value "$yuzuconf" "Screenshots\screenshot_path" "$screenshots_folder" "yuzu" "UI" fi fi + + # Update presets for all emulators after any reset or move + build_retrodeck_current_presets } From 19016e318ba04995750d3c9054c325b543846aef Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Sep 2023 09:59:32 +0200 Subject: [PATCH 60/76] Added deubg check on cooker pipeline --- .github/workflows/cooker-selfhosted.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index bf7e76fd..21855e1d 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -54,6 +54,9 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + - name: "[DEBUG] Outputting manifest" + run: cat net.retrodeck.retrodeck.yml + - name: "Adding flatpak portal for automated updates (cooker only)" run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml From 7c02cb2fbf0c0e8babd73c33927f817d16810f4d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Sep 2023 10:03:32 +0200 Subject: [PATCH 61/76] fix: Added deubg check on cooker pipeline --- .github/workflows/cooker-selfhosted.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 21855e1d..2ae40fe2 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -54,15 +54,15 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - - name: "[DEBUG] Outputting manifest" - run: cat net.retrodeck.retrodeck.yml - - name: "Adding flatpak portal for automated updates (cooker only)" run: sed -i '/finish-args:/a \ \ - --talk-name=org.freedesktop.Flatpak' net.retrodeck.retrodeck.yml # - name: "Updating release notes in appdata" # run: "automation_tools/appdata_management.sh" + - name: "[DEBUG] Outputting manifest" + run: cat net.retrodeck.retrodeck.yml + - name: "Build flatpak: download only" id: "flatpak-download" run: | From 0b6e791d461ff48d76753ef79710b1a9fb55e43e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Sep 2023 10:11:10 +0200 Subject: [PATCH 62/76] Manifest: removing old comments [skip ci] --- net.retrodeck.retrodeck.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ad873521..c281d570 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1202,7 +1202,6 @@ modules: - mkdir -p /app/tools - cp tools/configurator.sh /app/tools/configurator.sh - chmod +x /app/tools/configurator.sh - #- cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml - cp tools/retrodeck_function_wrapper.sh /app/tools/retrodeck_function_wrapper.sh - chmod +x /app/tools/retrodeck_function_wrapper.sh @@ -1214,8 +1213,6 @@ modules: - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop - cp net.retrodeck.retrodeck.Configurator.desktop /app/share/applications/net.retrodeck.retrodeck.Configurator.desktop - # TODO: group the configs per-emu and optimize the following cps, like already done with Dolphin. Please not that some files may be renamed, check retrodeck.sh to know how (and fix it after the edit) - # Initializing default emulator configs - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/ From 3a5c60314a4e67726a125275481afd89f097e56f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Sep 2023 10:11:52 +0200 Subject: [PATCH 63/76] Manifest: removing old comments [skip ci] --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c281d570..d9c8be09 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -15,7 +15,7 @@ finish-args: - --share=ipc - --share=network - --device=all - - --filesystem=home # Needed to be able to relocate / remove / create symlink at ~/retrodeck + - --filesystem=home - --filesystem=/run/media - --filesystem=/media - --allow=multiarch From b2014f250000a98ff8d733000650bd1c0c7c6d2a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Sep 2023 10:42:47 +0200 Subject: [PATCH 64/76] fix: string quoted --- functions/dialogs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/dialogs.sh b/functions/dialogs.sh index e77b65f7..00393287 100644 --- a/functions/dialogs.sh +++ b/functions/dialogs.sh @@ -170,7 +170,7 @@ changelog_dialog() { local version_changelog=$(xml sel -t -m "//release[@version='$1']/description" -v . -n $rd_appdata | tr -s '\n' | sed 's/^\s*//') echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" - $version_changelog >> "/var/config/retrodeck/changelog-partial.txt" + "$version_changelog" >> "/var/config/retrodeck/changelog-partial.txt" zenity --icon-name=net.retrodeck.retrodeck --text-info --width=1200 --height=720 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ From e327762ddef8ef30f75fcd3abae5301d6cd57fb3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Sep 2023 15:16:41 +0200 Subject: [PATCH 65/76] GB Colorization bug: tentative fix --- emu-configs/retroarch/retroarch-core-options.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emu-configs/retroarch/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg index 06420de7..ef112dce 100644 --- a/emu-configs/retroarch/retroarch-core-options.cfg +++ b/emu-configs/retroarch/retroarch-core-options.cfg @@ -294,6 +294,8 @@ gambatte_rumble_level = "10" gambatte_show_gb_link_settings = "disabled" gambatte_turbo_period = "4" gambatte_up_down_allowed = "disabled" +gambatte_input_player1_r = "nul" +gambatte_input_player1_l = "nul" genesis_plus_gx_add_on = "auto" genesis_plus_gx_addr_error = "enabled" genesis_plus_gx_aspect_ratio = "auto" From 91f1fac361af993c0e00faa508c4c84153dab7d2 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 7 Sep 2023 09:28:07 -0400 Subject: [PATCH 66/76] Remove current container when updating cooker Don't try to build presets before emulators have been set up on finit --- functions/checks.sh | 1 + functions/prepare_emulator.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/checks.sh b/functions/checks.sh index 710fd6c9..bb93b322 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -83,6 +83,7 @@ check_for_version_update() { local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/') mkdir -p "$rdhome/RetroDECK_Updates" wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download + flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck # Remove current version before installing new one, to avoid duplicates flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK-cooker.flatpak" rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space ) | diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index 441cc6b6..b4ade655 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -618,5 +618,7 @@ prepare_emulator() { fi # Update presets for all emulators after any reset or move - build_retrodeck_current_presets + if [[ ! "$emulator" == "retrodeck" ]]; then + build_retrodeck_current_presets + fi } From bf70523071c51f5b62cbcf4d4c500148fb47752e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 8 Sep 2023 13:54:24 +0200 Subject: [PATCH 67/76] RA: removing unsignificant lines from core overrides [skip ci] --- emu-configs/retroarch/retroarch-core-options.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/emu-configs/retroarch/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg index ef112dce..06420de7 100644 --- a/emu-configs/retroarch/retroarch-core-options.cfg +++ b/emu-configs/retroarch/retroarch-core-options.cfg @@ -294,8 +294,6 @@ gambatte_rumble_level = "10" gambatte_show_gb_link_settings = "disabled" gambatte_turbo_period = "4" gambatte_up_down_allowed = "disabled" -gambatte_input_player1_r = "nul" -gambatte_input_player1_l = "nul" genesis_plus_gx_add_on = "auto" genesis_plus_gx_addr_error = "enabled" genesis_plus_gx_aspect_ratio = "auto" From 8509e5b582f7da98713207aa18ae8f34fb5ff102 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 8 Sep 2023 13:55:53 +0200 Subject: [PATCH 68/76] RA: enabled save on quit [skip ci] --- emu-configs/retroarch/retroarch.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg index 3bda1f75..2fc14c02 100644 --- a/emu-configs/retroarch/retroarch.cfg +++ b/emu-configs/retroarch/retroarch.cfg @@ -80,7 +80,7 @@ cheevos_visibility_account = "true" cheevos_visibility_mastery = "true" cheevos_visibility_summary = "1" cheevos_visibility_unlock = "true" -config_save_on_exit = "false" +config_save_on_exit = "true" content_database_path = "/app/share/libretro/database/rdb" content_favorites_directory = "default" content_favorites_path = "/var/config/retroarch/content_favorites.lpl" From ea5eb22ca0672108cd55d7f9d59c6a5540f88d83 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 8 Sep 2023 15:50:08 +0200 Subject: [PATCH 69/76] ES-DE: last played is now the default startup system [skip ci] --- es-configs/es_settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 93de24b3..8247458d 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -143,7 +143,7 @@ - + From 01feccc324e29512f6c354e4a07e9f82c8e7fa39 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 8 Sep 2023 17:00:28 -0400 Subject: [PATCH 70/76] Reset presets to default when resetting emulator --- functions/prepare_emulator.sh | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index b4ade655..de1988b7 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -116,6 +116,29 @@ prepare_emulator() { dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks" dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache" dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture" "/var/config/retroarch/system/Mupen64plus/hires_texture" + + # Reset default preset settings + set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "cheevos")" "retrodeck" "cheevos" + set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore" + set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "genesis" "$(get_setting_value "$rd_defaults" "genesis" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "gg" "$(get_setting_value "$rd_defaults" "gg" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "n64" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "psx_ra" "$(get_setting_value "$rd_defaults" "psx_ra" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "snes" "retrodeck" "borders")" "retrodeck" "borders" + set_setting_value "$rd_conf" "genesis" "$(get_setting_value "$rd_defaults" "genesis" "retrodeck" "widescreen")" "retrodeck" "widescreen" + set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "n64" "retrodeck" "widescreen")" "retrodeck" "widescreen" + set_setting_value "$rd_conf" "psx_ra" "$(get_setting_value "$rd_defaults" "psx_ra" "retrodeck" "widescreen")" "retrodeck" "widescreen" + set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "snes" "retrodeck" "widescreen")" "retrodeck" "widescreen" + set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_load")" "retrodeck" "savestate_auto_load" + set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_save")" "retrodeck" "savestate_auto_save" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$bios_folder" "/var/config/retroarch/system" @@ -190,6 +213,10 @@ prepare_emulator() { dir_prep "$logs_folder/citra" "/var/data/citra-emu/log" dir_prep "$mods_folder/Citra" "/var/data/citra-emu/load/mods" dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures" + + # Reset default preset settings + set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$rdhome/bios/citra/sysdata" "/var/data/citra-emu/sysdata" @@ -237,6 +264,9 @@ prepare_emulator() { dir_prep "$saves_folder/wii/dolphin" "/var/data/dolphin-emu/Wii" dir_prep "$mods_folder/Dolphin" "/var/data/dolphin-emu/Load/GraphicMods" dir_prep "$texture_packs_folder/Dolphin" "/var/data/dolphin-emu/Load/Textures" + + # Reset default preset settings + set_setting_value "$rd_conf" "dolphin" "$(get_setting_value "$rd_defaults" "dolphin" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$saves_folder/gc/dolphin/EU" "/var/data/dolphin-emu/GC/EUR" @@ -283,6 +313,12 @@ prepare_emulator() { # Shared actions dir_prep "$states_folder/psx/duckstation" "/var/config/duckstation/savestates" # This is hard-coded in Duckstation, always needed dir_prep "$texture_packs_folder/Duckstation" "/var/config/duckstation/textures" + + # Reset default preset settings + set_setting_value "$rd_conf" "duckstation" "$(get_setting_value "$rd_defaults" "duckstation" "retrodeck" "cheevos")" "retrodeck" "cheevos" + set_setting_value "$rd_conf" "duckstation" "$(get_setting_value "$rd_defaults" "duckstation" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore" + set_setting_value "$rd_conf" "duckstation" "$(get_setting_value "$rd_defaults" "duckstation" "retrodeck" "savestate_auto_save")" "retrodeck" "savestate_auto_save" + set_setting_value "$rd_conf" "duckstation" "$(get_setting_value "$rd_defaults" "duckstation" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands set_setting_value "$duckstationconf" "SearchDirectory" "$bios_folder" "duckstation" "BIOS" @@ -364,6 +400,12 @@ prepare_emulator() { mkdir -pv "$saves_folder/ps2/pcsx2/memcards" mkdir -pv "$states_folder/ps2/pcsx2" dir_prep "$texture_packs_folder/PCSX2" "/var/config/PCSX2/textures" + + # Reset default preset settings + set_setting_value "$rd_conf" "pcsx2" "$(get_setting_value "$rd_defaults" "pcsx2" "retrodeck" "cheevos")" "retrodeck" "cheevos" + set_setting_value "$rd_conf" "pcsx2" "$(get_setting_value "$rd_defaults" "pcsx2" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore" + set_setting_value "$rd_conf" "pcsx2" "$(get_setting_value "$rd_defaults" "pcsx2" "retrodeck" "savestate_auto_save")" "retrodeck" "savestate_auto_save" + set_setting_value "$rd_conf" "pcsx2" "$(get_setting_value "$rd_defaults" "pcsx2" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands set_setting_value "$pcsx2conf" "Bios" "$bios_folder" "pcsx2" "Folders" @@ -442,6 +484,9 @@ prepare_emulator() { dir_prep "$saves_folder/wii/primehack" "/var/data/primehack/Wii" dir_prep "$mods_folder/Primehack" "/var/data/primehack/Load/GraphicMods" dir_prep "$texture_packs_folder/Primehack" "/var/data/primehack/Load/Textures" + + # Reset default preset settings + set_setting_value "$rd_conf" "primehack" "$(get_setting_value "$rd_defaults" "primehack" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$saves_folder/gc/primehack/EU" "/var/data/primehack/GC/EUR" @@ -601,6 +646,10 @@ prepare_emulator() { if [ -d $bios_folder/switch ]; then find $bios_folder/switch -xtype l -exec rm {} \; fi + + # Reset default preset settings + set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout" + set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$bios_folder/switch/keys" "/var/data/yuzu/keys" From 32463f1093c376c5d876053b4b5d583dd48f31ab Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 12 Sep 2023 13:36:18 +0200 Subject: [PATCH 71/76] ES-DE: revert: last played is no more the default startup system [skip ci] --- es-configs/es_settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 8247458d..93de24b3 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -143,7 +143,7 @@ - + From 61fde7009943cd0da1ec7eea6a224d5c2567c6e1 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 12 Sep 2023 10:40:28 -0400 Subject: [PATCH 72/76] Deploy helper files on finit and update Add Citra mod helper file --- .../how-to-install-citra-mods.txt | 19 +++++++++++++++++++ .../reference_lists/helper_files_list.cfg | 2 +- functions/functions.sh | 1 + functions/post_update.sh | 1 + 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt new file mode 100644 index 00000000..f9ce75bc --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt @@ -0,0 +1,19 @@ +There are two ways of adding mods into Citra + +From Citra +- Extract any mod from compressed .zip or any other format to folders. +- Open up Citra inside RetroDECK Configurator by pressing Open Emulator - Citra. +- Right click on the game you want to add mods into. +- Click on Open Mods Location. +- Paste the mod files inside that directory, each folder is stored by the TITLLEID of the game. +- Quit Citra + +From the mod folder directly +- Extract any mod files from compressed .zip or any other format into folders. +- Go into ~/retrodeck/mods/citra/. The folders are all named by TITLEID. +- Past the mods into the right ~/retrodeck/mods/yuzu/ folder. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/Citra%3A-Mods#citra---3ds + +The RetroDECK Team diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index d5a1be95..1b05ffff 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -2,4 +2,4 @@ # FILE NAME^DESTINATION # The destination can be an internal variable name like $roms_folder if needed # The FILE name can have spaces in it, but the DESTINATION cannot, even in variable form -RetroDECK Example Readme.txt^$rdhome +how-to-install-citra-mods.txt^$mods_folder/Citra diff --git a/functions/functions.sh b/functions/functions.sh index 7bcc6499..e6b6f9ed 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -422,6 +422,7 @@ finit() { ( prepare_emulator "reset" "all" build_retrodeck_current_presets + deploy_helper_files # Optional actions based on user choices if [[ "$finit_options_choices" =~ (rpcs3_firmware|Enable All) ]]; then diff --git a/functions/post_update.sh b/functions/post_update.sh index c65bd9f2..69194993 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -244,6 +244,7 @@ post_update() { fi update_splashscreens + deploy_helper_files build_retrodeck_current_presets ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ From 880c8225b28dbc6c74975a2e8dfc223a2121963d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 12 Sep 2023 16:46:20 +0200 Subject: [PATCH 73/76] Adding more helper files --- .../how-to-install-citra-mods.txt | 2 +- .../how-to-install-dolphin-mods.txt | 10 ++++++++ .../how-to-install-primehack-mods.txt | 10 ++++++++ .../helper_files/how-to-install-yuzu-mods.txt | 25 +++++++++++++++++++ .../reference_lists/helper_files_list.cfg | 3 +++ 5 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-yuzu-mods.txt diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt index f9ce75bc..8918ba2d 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-citra-mods.txt @@ -16,4 +16,4 @@ From the mod folder directly Related wiki article can be found here: https://github.com/XargonWan/RetroDECK/wiki/Citra%3A-Mods#citra---3ds -The RetroDECK Team +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt new file mode 100644 index 00000000..150ed2ba --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt @@ -0,0 +1,10 @@ +- Extract any mod files from compressed .zip or any other format into folders. + +- Go into mods folders, they contain folders that are all named by GAME_ID. ~/retrodeck/mods/dolphin/ + +- Move the mods into the right folder: ~/retrodeck/mods/dolphin/ + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt new file mode 100644 index 00000000..f88e8a4e --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt @@ -0,0 +1,10 @@ +- Extract any mod files from compressed .zip or any other format into folders. + +- Go into mods folders, they contain folders that are all named by GAME_ID. ~/retrodeck/mods/primehack/. + +- Move the mods into the right folder: ~/retrodeck/mods/primehack/ + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-yuzu-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-yuzu-mods.txt new file mode 100644 index 00000000..1f41c698 --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-yuzu-mods.txt @@ -0,0 +1,25 @@ +There are two ways of adding mods into Yuzu + +From Yuzu directly +- Extract any mod files from compressed .zip or any other format to folders. +- Open up Yuzu inside RetroDECK Configurator by pressing Open Emulator - Yuzu. +- Right click on the game you want to add mods into. +- Click on Open Mod Data Destination. +- Paste the mod folders inside that directory. +- Right clicking on the game and selecting Properties. +- Enable the mods you want to enable by pressing the checkboxes in the Add-Ons tab and press OK. +- Quit Yuzu + +From the mods/yuzu folder +- Extract any mod files from compressed .zip or any other format into folders. +- Go into ~/retrodeck/mods/yuzu/ and file the right folder for the game you want to add mods to. The folders are all named by TITLEID. +- Move those folders into ~/retrodeck/mods/yuzu/ +- Open up Yuzu inside RetroDECK Configurator by pressing Open Emulator - Yuzu. +- Right clicking on the game and selecting Properties. +- Enable the mods you want to enable by pressing the checkboxes in the Add-Ons tab and press OK. +- Quit Yuzu + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/Yuzu%3A-Mods + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index 1b05ffff..0c1e9a8b 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -3,3 +3,6 @@ # The destination can be an internal variable name like $roms_folder if needed # The FILE name can have spaces in it, but the DESTINATION cannot, even in variable form how-to-install-citra-mods.txt^$mods_folder/Citra +how-to-install-dolphin-mods.txt^$mods_folder/Dolphin +how-to-install-primehack-mods.txt^$mods_folder/Primehack +how-to-install-yuzu-mods.txt^$mods_folder/Yuzu \ No newline at end of file From 09497f1f75578126ac561d5e4576f01baa05222d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 13 Sep 2023 12:12:14 +0200 Subject: [PATCH 74/76] Yuzu helper file wasn't deployed --- .../defaults/retrodeck/reference_lists/helper_files_list.cfg | 2 +- net.retrodeck.retrodeck.appdata.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index 0c1e9a8b..8243c5e9 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -5,4 +5,4 @@ how-to-install-citra-mods.txt^$mods_folder/Citra how-to-install-dolphin-mods.txt^$mods_folder/Dolphin how-to-install-primehack-mods.txt^$mods_folder/Primehack -how-to-install-yuzu-mods.txt^$mods_folder/Yuzu \ No newline at end of file +how-to-install-yuzu-mods.txt^$mods_folder/Yuzu diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 4a126254..e737f8f5 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -74,6 +74,7 @@
  • Redone the patches for ES-DE
  • Updated theme
  • Changelog is now scrollable
    • +
  • Added helper files in the mods folders to instruct the users on the procedures to follow
    •      From dba58a3ecc561ade7bad0db231ef2d14f1b15ddc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 13 Sep 2023 12:41:15 +0200 Subject: [PATCH 75/76] Added textures helper files --- .../how-to-install-Duckstation-textures.txt | 28 ++++++++++++++++ .../how-to-install-Mesen-textures.txt | 32 +++++++++++++++++++ .../how-to-install-Mupen64Plus-textures.txt | 30 +++++++++++++++++ .../how-to-install-PCSX2-textures.txt | 26 +++++++++++++++ .../how-to-install-PPSSPP-textures.txt | 26 +++++++++++++++ .../how-to-install-dolphin-mods.txt | 15 +++++++-- .../how-to-install-primehack-mods.txt | 13 ++++++-- .../reference_lists/helper_files_list.cfg | 10 ++++++ 8 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt create mode 100644 emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt new file mode 100644 index 00000000..4deee10f --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt @@ -0,0 +1,28 @@ +The ~/retrodeck/texture_packs/duckstaiton/ represents the /duckstation/textures/ folder in Duckstation. + +Note: +Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it. + +Note: +TITLEID is different for every game. + +Enable Custom Textures +- Open up Duckstation inside RetroDECK Configurator by pressing Open Emulator - Duckstation. +- Go to Settings -> Advanced -> Tweaks/Hacks +- Enable VRAM Write Texture Replacement and set it to On. +- Preload Texture Replacements and set it to On. + +How do I add texture packs? +Requirements: Texture pack files + +NOTE: On the Steam Deck this could be easier to do in Desktop Mode. + +Texture folder directly +- Extract any texture pack files from compressed .zip or any other format into folders. +- Go into ~/retrodeck/texture_packs/duckstation/. The folders are all named by TITLEID. +- Move textures into the right ~/retrodeck/texture_packs/duckstation/ folder. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/Duckstation%3A-Texture-Packs + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt new file mode 100644 index 00000000..33e9d9c8 --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt @@ -0,0 +1,32 @@ +RetroArch - NES - Mesen +The texture_packs/RetroArch-Mesen/ represents /retroarch/system/HdPacks/ folder. + +Note: +Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it. + +Enable Texture Packs in the Mesen core for certain games +From the RetroArch Quick Menu + +- Go to Core Options -> Enable HD Packs set to On +- Then save the current configuration for that game under Core Options -> Manage Core Options -> Save Game Options + +How do I add texture packs that can be used by the Mesen Core? +NOTE: On the Steam Deck this could be easier to do in Desktop Mode. + +- All texture packs go into the texture_packs/RetroArch-Mesen/ folder. +- The texture pack have to be extracted from .zip or other compressed format into a folder. +- The name of the folder must be the same name as that of the rom file the texture pack is for. +Example: + +You want apply a texture pack to a game called ScaryCastle USA.nes and you have downloaded the ScaryCastle TexturePACK HD.zip. + +- Extract the ScaryCastle TexturePACK HD.zip +- Move the extracted ScaryCastle TexturePACK HD folder into texture_packs/RetroArch-Mesen/ +- Rename the ScaryCastle TexturePACK HD folder so it has the same name as the rom ScaryCastle USA without the .nes file extension. +- Start up RetroDECK and select the ScaryCastle nes games. +NOTE: On the Steam Deck go into GameMode first, then launch RetroDECK. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mesen%3A-Texture-Packs + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt new file mode 100644 index 00000000..6cfe0670 --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt @@ -0,0 +1,30 @@ +RetroArch - N64 - Mupen64Plus-Next + +The directory 'texture_packs/RetroArch-Mupen64Plus/' corresponds to the '/retroarch/system/Mupen64plus/' folder. + +Please note that some texture packs may be designed for a specific version or region of the game. Ensure you have the correct ROM and textures for it. + +To enable Texture Packs in the Mupen64Plus-Next core for certain games, follow these steps: + +1. Open the RetroArch Quick Menu. +2. Navigate to Core Options -> GLideN64. +3. Set 'Use High-Res Textures', 'Cache Textures', 'Use High-Res Full Alpha Channel', and 'Use Hi-Res Storage' to On. +4. Save the current configuration for that game under Core Options -> Manage Core Options -> Save Game Options. + +Optionally, you can set 'Use High-Res Texture Cache Compression' to On to compress uncompressed HD Textures into .hts files. + +To add texture packs that can be used by the Mupen64Plus-Next Core: + +Note: On the Steam Deck, this could be easier to do in Desktop Mode. + +1. All texture packs go into the 'texture_packs//RetroArch-Mupen64Plus/hires_texture/' or 'texture_packs/RetroArch-Mupen64Plus/cache/' folder. +2. The texture pack must be extracted from .zip or other compressed format into a folder. + +For compressed textures stored in .hts files, place them in the 'texture_packs/RetroArch-Mupen64Plus/cache/' folder. + +For uncompressed textures stored in loose folders or files, place them in the 'texture_packs/RetroArch-Mupen64Plus/hires_texture/' folder. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mupen64Plus-Next%3A-Texture-Packs + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt new file mode 100644 index 00000000..807513b7 --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt @@ -0,0 +1,26 @@ +PCSX2 - Playstation 2 + +The directory '~/retrodeck/texture_packs/PCSX2/' corresponds to the '/PCSX2/textures/' folder in PCSX2. + +Please note that some texture packs may be designed for a specific version or region of a game. Ensure you have the correct game and textures for it. + +Also, keep in mind that 'TITLEID' is different for every game. + +To enable Custom Textures, follow these steps: + +1. Open up PCSX2 inside RetroDECK Configurator by pressing 'Open Emulator' - 'PCSX2'. +2. Press 'Settings' -> 'Graphics'. +3. Set 'Load Textures' and 'Async Texture Loading' to On. + +To add texture packs, you'll need the texture pack files. On the Steam Deck, this could be easier to do in Desktop Mode. + +For direct texture folder: + +1. Extract any texture pack files from compressed .zip or any other format into folders. +2. Go into '~/retrodeck/texture_packs/PCSX2/'. The folders are all named by 'TITLEID'. +3. Move textures into the correct '~/retrodeck/texture_packs/PCSX2/' folder. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/PCSX2%3A-Texture-Packs + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt new file mode 100644 index 00000000..6fabb0e4 --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt @@ -0,0 +1,26 @@ +PPSSPP - PSP + +The directory '~/retrodeck/texture_packs/ppsspp/' corresponds to the '/PSP/TEXTURES/' folder in PPSSPP. + +Please note that some texture packs may be designed for a specific version or region of the game. Ensure you have the correct ROM and textures for it. + +Also, keep in mind that 'TITLEID' is different for every game. + +To enable Custom Textures, follow these steps: + +1. Open up PPSSPP inside RetroDECK Configurator by pressing 'Open Emulator' - 'PPSSPP'. +2. Press 'Settings' -> 'Tools' -> 'Developer Tools'. +3. Set 'Replace Textures' to On. + +To add texture packs, you'll need the texture pack files. On the Steam Deck, this could be easier to do in Desktop Mode. + +For adding textures: + +1. Extract any texture pack files from compressed .zip or any other format into folders. +2. Go into '~/retrodeck/texture_packs/ppsspp/'. The folders are all named by 'TITLEID'. +3. Paste the textures into the correct '~/retrodeck/texture_packs/ppsspp/' folder. + +Related wiki article can be found here: +https://github.com/XargonWan/RetroDECK/wiki/PPSSPP%3A-Texture-Packs + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt index 150ed2ba..33a50c8c 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt @@ -1,9 +1,18 @@ +Prerequisites +- Open up Dolphin inside RetroDECK Configurator by pressing Open Emulator - Dolphin. +- Press Options -> Graphic Settings +- Enable Graphics Mods and set it to On. + +Installation - Extract any mod files from compressed .zip or any other format into folders. - -- Go into mods folders, they contain folders that are all named by GAME_ID. ~/retrodeck/mods/dolphin/ - +- Go into mods folders, they contain folders that are all named by GAME_ID. ~/retrodeck/mods/dolphin/. - Move the mods into the right folder: ~/retrodeck/mods/dolphin/ +Notes: +- The ~/retrodeck/mods/dolphin/ that represents the /load/GraphicMods folder. +- Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it. +- GAME_ID is different for every game. + Related wiki article can be found here: https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt index f88e8a4e..1bcbbc05 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt @@ -1,9 +1,18 @@ +Prerequisites +- Open up Primehack inside RetroDECK Configurator by pressing Open Emulator - Primehack. +- Press Options -> Graphic Settings +- Enable Graphics Mods and set it to On. + +Installation - Extract any mod files from compressed .zip or any other format into folders. - - Go into mods folders, they contain folders that are all named by GAME_ID. ~/retrodeck/mods/primehack/. - - Move the mods into the right folder: ~/retrodeck/mods/primehack/ +Notes: +- The ~/retrodeck/mods/primehack/ that represents the /load/GraphicMods folder. +- Some texture packs could made for a specific version or region of a game. Make sure you have the right game and textures for it. +- GAME_ID is different for every game. + Related wiki article can be found here: https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index 8243c5e9..4f30fe78 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -2,7 +2,17 @@ # FILE NAME^DESTINATION # The destination can be an internal variable name like $roms_folder if needed # The FILE name can have spaces in it, but the DESTINATION cannot, even in variable form + +# mods how-to-install-citra-mods.txt^$mods_folder/Citra how-to-install-dolphin-mods.txt^$mods_folder/Dolphin how-to-install-primehack-mods.txt^$mods_folder/Primehack how-to-install-yuzu-mods.txt^$mods_folder/Yuzu + +# textures +how-to-install-Mesen-textures.txt^$texture_packs_folder/RetroArch-Mesen +how-to-install-PPSSPP-textures.txt^$texture_packs_folder/PPSSPP +how-to-install-PCSX2-textures.txt^$texture_packs_folder/PCSX2 +how-to-install-Mupen64Plus-textures.txt^$texture_packs_folder/RetroArch-Mupen64Plus/cache +how-to-install-Mupen64Plus-textures.txt^$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture +how-to-install-Duckstation-textures.txt^$texture_packs_folder/Duckstation \ No newline at end of file From e40676436f9f2c3b0eb417b659db757a38def38f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 13 Sep 2023 14:50:20 +0200 Subject: [PATCH 76/76] Last line fix --- .../defaults/retrodeck/reference_lists/helper_files_list.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index 4f30fe78..aaa8ad51 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -15,4 +15,4 @@ how-to-install-PPSSPP-textures.txt^$texture_packs_folder/PPSSPP how-to-install-PCSX2-textures.txt^$texture_packs_folder/PCSX2 how-to-install-Mupen64Plus-textures.txt^$texture_packs_folder/RetroArch-Mupen64Plus/cache how-to-install-Mupen64Plus-textures.txt^$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture -how-to-install-Duckstation-textures.txt^$texture_packs_folder/Duckstation \ No newline at end of file +how-to-install-Duckstation-textures.txt^$texture_packs_folder/Duckstation