From 2143656ba01b18929a0b71f5fc800b3113fecaf2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 10 Aug 2024 20:12:01 +0900 Subject: [PATCH 1/5] WORKFLOW: adding github token to elevate refwrite tag task permissions [skip ci] --- .github/workflows/cooker-selfhosted.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 3b9b06f8..9619d00a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -166,6 +166,8 @@ jobs: fi git tag "${{ env.TAG }}" # Create the tag locally git push origin "${{ env.TAG }}" # Push the new tag in the remote repo + env: + GITHUB_TOKEN: ${{ secrets.TRIGGER_BUILD_TOKEN }} # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release - name: Upload RetroDECK-cooker.flatpak From 5654864317fd2dcb9cdd7a78ae25f9dddd13f856 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 11 Aug 2024 21:53:36 +0900 Subject: [PATCH 2/5] ES-DE: theme was set not correctly --- config/es-de/es_settings.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/es-de/es_settings.xml b/config/es-de/es_settings.xml index c1d69bd9..e1d5c195 100644 --- a/config/es-de/es_settings.xml +++ b/config/es-de/es_settings.xml @@ -153,13 +153,12 @@ - + - - - + + - + \ No newline at end of file From 0be430f8117e22c35d0ff91a1ada0299a8c0e152 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 12 Aug 2024 09:14:59 +0900 Subject: [PATCH 3/5] PRE_BUILD_AUTOMATION: added THISREPO placeholder --- automation_tools/pre_build_automation.sh | 20 ++++++++++++++++++++ net.retrodeck.retrodeck.yml | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh index 3dabcc85..c05a9879 100755 --- a/automation_tools/pre_build_automation.sh +++ b/automation_tools/pre_build_automation.sh @@ -51,7 +51,18 @@ get_current_branch() { fi } +# Retrieve the repository URL +get_repo_url() { + local repo_url=$(git config --get remote.origin.url) + # Convert SSH URL to HTTPS if needed + if [[ "$repo_url" == git@* ]]; then + repo_url=$(echo "$repo_url" | sed -e 's|git@|https://|' -e 's|:|/|') + fi + echo "$repo_url" +} + current_branch=$(get_current_branch) +current_repo_url=$(get_repo_url) echo "Manifest location: $rd_manifest" echo "Automation task list location: $automation_task_list" @@ -170,6 +181,13 @@ handle_url() { /bin/sed -i 's^'"$placeholder"'^'"$calculated_url"'^g' "$rd_manifest" } +# Handle the THISREPO placeholder +handle_thisrepo() { + local placeholder="$1" + echo "Replacing placeholder $placeholder with repository URL $current_repo_url" + /bin/sed -i 's^'"$placeholder"'^'"$current_repo_url"'^g' "$rd_manifest" +} + # Process the task list while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do if [[ ! "$action" == "#"* ]] && [[ -n "$action" ]]; then @@ -184,6 +202,8 @@ while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do "outside_env_var" ) handle_outside_env_var "$placeholder" "$url" ;; "custom_command" ) handle_custom_command "$url" ;; "url" ) handle_url "$placeholder" "$url" ;; + "THISREPO" ) handle_thisrepo "$placeholder" ;; esac fi done < "$automation_task_list" + diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 02b96588..15688331 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -90,7 +90,7 @@ modules: echo "Version is $VERSION" sources: - type: git - url: https://github.com/RetroDECK/RetroDECK.git + url: THISREPO branch: THISBRANCH - name: xmlstarlet @@ -178,7 +178,7 @@ modules: sha256: f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4 dest: fontconfig - type: git - url: https://github.com/RetroDECK/RetroDECK.git + url: THISREPO branch: THISBRANCH # RetroArch @@ -649,5 +649,5 @@ modules: sources: - type: git - url: https://github.com/RetroDECK/RetroDECK.git + url: THISREPO branch: THISBRANCH \ No newline at end of file From 23c35aea586e9631d05c35030b65e9ff84527a51 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 12 Aug 2024 09:22:37 +0900 Subject: [PATCH 4/5] PRE_BUILD_AUTOMATION: added THISREPO placeholder - fix --- automation_tools/automation_task_list.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index 3aca9069..9b15ff4b 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -6,6 +6,7 @@ latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid branch^THISBRANCH +THISREPO^THISREPO hash^RASHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch.7z hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip From eabdb760dd4a099eba0472b07d337bb9059b8a86 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 12 Aug 2024 12:14:09 +0900 Subject: [PATCH 5/5] POST_UPDATE: 0.8.3b check, missing space fix [skip ci] --- functions/post_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index 22eb5caf..f5fed10e 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -352,7 +352,7 @@ post_update() { if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then # In version 0.8.3b, the following changes were made: # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations. - if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then + if [[ ! -d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug" if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"