From a75060611a141adddbe080b81892d5bea957ad9f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 25 Aug 2023 15:13:31 +0200
Subject: [PATCH] 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