Release 2.9.1

.github/workflows/continuous-integration.yml

@@ -0,0 +1,93 @@
+name: Continuous Integration
+
+env:
+  # The name of the main module repository
+  main_project_module: app
+
+on:
+  push:
+    branches:
+     - main
+     - develop
+     - release/*
+  pull_request:
+    branches:
+     - main
+     - develop
+     - release/*
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  ci_job:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      # Run check style
+      - name: Kotlin checkstyle
+        run: ./gradlew ktlintCheck
+
+      # Running unit tests on app module
+      - name: Run app module tests
+        run: ./gradlew :app:testDhisDebugUnitTest
+
+      # Running unit tests on all other modules
+      - name: Run all modules tests
+        run: ./gradlew testDebugUnitTest
+
+      # Run Build Project
+      #- name: Build gradle project
+       # run: ./gradlew build
+
+  deployment_job:
+    runs-on: ubuntu-latest
+    needs: ci_job
+    if: github.event_name == 'pull_request' && needs.ci_job.result == 'success'
+    steps:
+      - uses: actions/checkout@v3
+
+      # Set Current Date As Env Variable
+      - name: Set current date as env variable
+        run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+      # Set Repository Name As Env Variable
+      - name: Set repository name as env variable
+        run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      # Create APK Debug
+      - name: Build apk debug project (APK) - ${{ env.main_project_module }} module
+        run: ./gradlew assembleDhisDebug
+
+      - name: Read version name from file
+        working-directory: ./gradle
+        id: read-version
+        run: echo "::set-output name=vName::$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')"
+
+      # Upload Artifact Build
+      - name: Upload Android artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.repository_name }} - Android APK
+          path: ${{ env.main_project_module }}/build/outputs/apk/dhis/debug/dhis2-v${{ steps.read-version.outputs.vName }}-dhis-debug.apk

.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
 
@@ -20,9 +25,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    # override vName with new version
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.12.1
+
+    - name: setup git config
+      run: |
+        # setup the username and email.
+        git config user.name "GitHub Actions Bot"
+        git config user.email "<[email protected]>"
+
+    - 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.development_version_name }}"
+        git push
+
+      # override vName with new version
     - name: Create release branch
-      run: git checkout -b release/${{ inputs.version_name }}
+      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 push origin release/${{ inputs.version_name }}
+      run: |
+        git add .
+        git commit -m "Update version to ${{ inputs.release_version_name }}"
+        git push origin release/${{ inputs.release_version_name }}

Jenkinsfile

@@ -44,12 +44,28 @@ pipeline {
             steps {
                 script {
                     echo 'Building UI APKs'
-                    sh './gradlew :app:assembleDhisUITestingDebug :app:assembleDhisUITestingDebugAndroidTest :compose-table:assembleAndroidTest'
+                    sh './gradlew :app:assembleDhisUITestingDebug :app:assembleDhisUITestingDebugAndroidTest :compose-table:assembleAndroidTest :form:assembleAndroidTest'
                 }
             }
         }
         stage('Run tests') {
             parallel {
+                stage('Deploy and run Form Tests') {
+                        environment {
+                            BROWSERSTACK = credentials('android-browserstack')
+                            form_apk = sh(returnStdout: true, script: 'find form/build/outputs -iname "*.apk" | sed -n 1p')
+                            form_apk_path = "${env.WORKSPACE}/${form_apk}"
+                        }
+                        steps {
+                            dir("${env.WORKSPACE}/scripts"){
+                                script {
+                                    echo 'Browserstack deployment and running Form module tests'
+                                    sh 'chmod +x browserstackJenkinsForm.sh'
+                                    sh './browserstackJenkinsForm.sh'
+                                }
+                            }
+                        }
+                    }
                 stage('Deploy compose-table module Tests') {
                     environment {
                         BROWSERSTACK = credentials('android-browserstack')