Merge remote-tracking branch 'upstream/cooker-0.7.2b' into cooker-0.7.2b-icenine451

.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'
@@ -51,7 +53,8 @@ jobs:
       - name: Run pre-build automation tasks
         run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
 
-      - name: Setting branch in the manifest
+      # 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)"

.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'
@@ -43,10 +45,11 @@ 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/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
-          echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"  
+          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
@@ -55,7 +58,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."

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}