From 6a13aecb0e413718601c6b00750363f0a8653aca Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Tue, 2 Jan 2024 15:38:43 +0100
Subject: [PATCH] update development and release version names

---
 .github/workflows/release-start.yml | 32 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
index dc21185b3e..bc85cca7c0 100644
--- a/.github/workflows/release-start.yml
+++ b/.github/workflows/release-start.yml
@@ -8,8 +8,13 @@ on:
   workflow_dispatch:
     # Inputs the workflow accepts.
     inputs:
-      version_name:
-        description: 'Release version name'
+      release_version_name:
+        description: 'New release version name'
+        required: true
+        type: string
+
+      development_version_name:
+        description: 'Development version name'
         required: true
         type: string
 
@@ -28,23 +33,30 @@ jobs:
       with:
         python-version: 3.12.1
 
-    - name: Run Python script to update base branch version
-      run: python scripts/updateVersionName.py ${{ inputs.version_name }}
-
     - name: setup git config
       run: |
         # setup the username and email.
         git config user.name "GitHub Actions Bot"
         git config user.email "<android@dhis2.org>"
 
+    - name: Run Python script to update base branch version
+      run: python scripts/updateVersionName.py ${{ inputs.development_version_name }}
+
     - name: Commit and Push Changes
       run: |
         git add .
-        git commit -m "Update version to ${{ inputs.version_name }}"
+        git commit -m "Update version to ${{ inputs.development_version_name }}"
         git push
 
       # override vName with new version
-#    - name: Create release branch
-#      run: git checkout -b release/${{ inputs.version_name }}
-#    - name: Push
-#      run: git push origin release/${{ inputs.version_name }}
+    - name: Create release branch
+      run: git checkout -b release/${{ inputs.release_version_name }}
+
+    - name: Run Python script to update release branch version
+      run: python scripts/updateVersionName.py ${{ inputs.release_version_name }}
+
+    - name: Push
+      run: |
+        git add .
+        git commit -m "Update version to ${{ inputs.release_version_name }}"
+        git push origin release/${{ inputs.release_version_name }}