Uncommenting version bump and deleting branch from develop.yml

.github/workflows/develop.yml

@@ -3,41 +3,40 @@ on:
   push:
     branches:
       - 'develop'
-      - 'test-develop-workflow'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
 
-  # version-bump:
-  #   name: 'Version Bump'
-  #   runs-on: ubuntu-20.04
-  #   steps:
-  #     - name: 'Check out code'
-  #       uses: actions/checkout@v3
-  #       with:
-  #         token: ${{ secrets.JENKINS_GITHUB_PAT }}
-  #         # fetch-depth 0 means deep clone the repo
-  #         fetch-depth: 0
-  #     - name: 'Update Version'
-  #       run: |
-  #         set -x
-  #         git config user.name devops
-  #         git config user.email [email protected]
-  #         git checkout -B master origin/master
-  #         old_develop="$(git merge-base origin/develop origin/master)"
-  #         new_develop="$(git rev-parse origin/develop)"
-  #         if git diff --exit-code ${old_develop} ${new_develop} -- package/version; then
-  #           git merge --no-edit origin/develop
-  #           ./package/version.sh bump
-  #         else
-  #           git merge --no-edit --strategy-option=theirs origin/develop
-  #         fi
-  #         ./package/version.sh sub
-  #         if git add --update && git commit --no-edit --allow-empty --message "Set Version: $(cat package/version)"; then
-  #           git push origin master
-  #         fi
+  version-bump:
+    name: 'Version Bump'
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 'Check out code'
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.JENKINS_GITHUB_PAT }}
+          # fetch-depth 0 means deep clone the repo
+          fetch-depth: 0
+      - name: 'Update Version'
+        run: |
+          set -x
+          git config user.name devops
+          git config user.email [email protected]
+          git checkout -B master origin/master
+          old_develop="$(git merge-base origin/develop origin/master)"
+          new_develop="$(git rev-parse origin/develop)"
+          if git diff --exit-code ${old_develop} ${new_develop} -- package/version; then
+            git merge --no-edit origin/develop
+            ./package/version.sh bump
+          else
+            git merge --no-edit --strategy-option=theirs origin/develop
+          fi
+          ./package/version.sh sub
+          if git add --update && git commit --no-edit --allow-empty --message "Set Version: $(cat package/version)"; then
+            git push origin master
+          fi
 
   post-performance-tests:
     name: 'Performace Tests'