feat(GAT-7966): updated semantic pipeline for merge back to dev

.github/workflows/deployment.yaml

@@ -1,5 +1,5 @@
 name: Deploy Release
-run-name: ${{ github.actor }} triggered deploy to ${{ github.event.inputs.env }} pipeline
+run-name: ${{ github.actor }} triggered deploy to ${{ github.event.inputs.env }} pipeline for tag version ${{ github.event.inputs.tag_version }}
 
 on:
   workflow_dispatch:

.github/workflows/semantic-release-workflow.yml

@@ -36,7 +36,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ env.NODE_VERSION }}
 
@@ -59,17 +59,23 @@ jobs:
           git fetch origin main
           git reset --hard origin/main
 
+      - name: Read VERSION file
+        id: getversion
+        run: |
+          sed -n 's/^appVersion:\(.*\)/\1/p' < "chart/gateway-medcat/Chart.yaml" > "version"
+          echo "version=$(sed 's/.*\"\(.*\)\".*/\1/g' "version")" >> "$GITHUB_OUTPUT"
+
       - name: Merge changes from main to dev
         env:
           GITHUB_TOKEN: ${{ steps.generate-deployment-token.outputs.token }}
+          RELEASE_VERSION: ${{ steps.getversion.outputs.version }}
         run: |
           git fetch origin dev
           git checkout dev
-          git merge --no-ff main || true
-          git checkout --theirs .
+          git merge --squash origin/main || true
+          git checkout --theirs . || true
           git add .
-          git commit -m "Auto-resolve merge conflicts by keeping main's changes [skip ci]" || echo "No changes to commit"
-
+          git commit --allow-empty -m "sync: update dev with latest main changes from release ${RELEASE_VERSION} (squash sync) [skip ci]"
           git push origin dev       
 
   build: