From 88996afd085afbea527d01cc82aa6dc69106a715 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 30 Aug 2023 17:26:16 +0200 Subject: [PATCH] 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)"