Update Charts appVersion

Merge to main for Prod release

.github/actions/update_manifest_repo/action.yaml

@@ -60,10 +60,10 @@ runs:
 
     - name: Update release version
       shell: bash
-      if: inputs.release_version != null
+      if: inputs.release_version != null && inputs.target == 'prod'
       run: |
         cd ./${{ inputs.repository_checkout_path }}/${{ inputs.charts_path }}
-        yq eval '.release.version = "${{ inputs.release_version }}"' -i values-${{ inputs.target }}.yaml
+        yq eval '.appVersion = "${{ inputs.release_version }}"' -i Chart.yaml
 
     - name: Update holder image
       shell: bash

.github/workflows/on_pr_opened.yaml

@@ -87,7 +87,6 @@ jobs:
         run: |
           yq eval '.global.fullnameOverride = "pr-${{ github.event.number }}-traction"' -i ./charts-repo/charts/traction/values-pr.yaml
           yq eval '.postgresql.fullnameOverride = "pr-${{ github.event.number }}-traction"' -i ./charts-repo/charts/traction/values-pr.yaml
-          yq eval '.release.version = "${{ steps.read_repo.outputs.release_version }}"' -i ./charts-repo/charts/traction/values-pr.yaml
           yq eval '.holder.image.tag = "${{ needs.build_holder.outputs.image_tag }}"' -i ./charts-repo/charts/traction/values-pr.yaml
           yq eval '.holder.image.version = "${{ needs.build_holder.outputs.image_version }}"' -i ./charts-repo/charts/traction/values-pr.yaml
           yq eval '.holder.image.buildtime = "${{ needs.build_holder.outputs.buildtime }}"' -i ./charts-repo/charts/traction/values-pr.yaml

.github/workflows/on_push_tag.yaml

@@ -87,3 +87,22 @@ jobs:
           verifier_image_tag: ${{ steps.read_repo.outputs.verifier_image_tag }}
           verifier_image_version: ${{ steps.read_repo.outputs.verifier_image_version }}
           verifier_image_buildtime: ${{ steps.read_repo.outputs.verifier_image_buildtime }}
+
+  merge_to_main:
+    name: Merge to main
+    runs-on: ubuntu-20.04
+    needs: 
+      - init
+      - update_config
+    if: ${{ contains(needs.*.result, 'success') && !(contains(needs.*.result, 'failure')) && needs.init.outputs.promote_to == 'prod' }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Merge develop to main
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: develop
+          target_branch: main
+          github_token: ${{ github.token }}