Merge pull request #916 from LerianStudio/main

chore: backmerge from main to develop

Author: guimoreirar

.github/workflows/release.yml

@@ -222,4 +222,72 @@ jobs:
     secrets:
       SLACK_BOT_TOKEN_HELM: ${{ secrets.SLACK_BOT_TOKEN_HELM }}
       SLACK_CHANNEL_DEVOPS: ${{ secrets.SLACK_CHANNEL_DEVOPS }}
-      SLACK_GROUP_TECH_SUPPORT: ${{ secrets.SLACK_GROUP_TECH_SUPPORT }}
+      SLACK_GROUP_TECH_SUPPORT: ${{ secrets.SLACK_GROUP_TECH_SUPPORT }}
+
+  back-merge:
+    needs:
+      - get-changed-paths
+      - release-helm-chart
+    name: 🔀 Back Merge to Develop
+    if: needs.get-changed-paths.outputs.matrix != '[]' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate GitHub App Token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.LERIAN_STUDIO_MIDAZ_PUSH_BOT_APP_ID }}
+          private-key: ${{ secrets.LERIAN_STUDIO_MIDAZ_PUSH_BOT_PRIVATE_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.LERIAN_CI_CD_USER_GPG_KEY }}
+          passphrase: ${{ secrets.LERIAN_CI_CD_USER_GPG_KEY_PASSWORD }}
+          git_committer_name: ${{ secrets.LERIAN_CI_CD_USER_NAME }}
+          git_committer_email: ${{ secrets.LERIAN_CI_CD_USER_EMAIL }}
+          git_config_global: true
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
+      - name: Create Pull Request for Back Merge
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          GIT_AUTHOR_NAME: ${{ secrets.LERIAN_CI_CD_USER_NAME }}
+          GIT_AUTHOR_EMAIL: ${{ secrets.LERIAN_CI_CD_USER_EMAIL }}
+          GIT_COMMITTER_NAME: ${{ secrets.LERIAN_CI_CD_USER_NAME }}
+          GIT_COMMITTER_EMAIL: ${{ secrets.LERIAN_CI_CD_USER_EMAIL }}
+        run: |
+          git fetch origin main develop
+
+          # Check if there are differences between main and develop
+          if git diff --quiet origin/main origin/develop; then
+            echo "No differences between main and develop. Skipping PR creation."
+            exit 0
+          fi
+
+          # Check if a back-merge PR already exists
+          EXISTING_PR=$(gh pr list --base develop --head main --state open --json number --jq '.[0].number')
+
+          if [ -n "$EXISTING_PR" ]; then
+            echo "Back-merge PR #$EXISTING_PR already exists. Skipping PR creation."
+            exit 0
+          fi
+
+          # Create the back-merge PR
+          gh pr create \
+            --base develop \
+            --head main \
+            --title "chore: back merge main into develop" \
+            --body "## Back Merge
+
+          This PR merges the latest changes from \`main\` back into \`develop\` to keep the branches in sync after a release.
+
+          ### Auto-generated
+          This PR was automatically created by the release pipeline."

README.md

@@ -16,7 +16,7 @@
 
 | Chart Version | Console Version | Onboarding Version | Transaction Version |
 | :---: | :---: | :---: | :---: |
-| `4.4.8` | `3.4.6` | `3.4.4` | `3.4.7` |
+| `4.5.0` | 3.4.8 | 3.4.8 | 3.4.8 |
 -----------------
 
 ### Plugin Access Manager Helm Chart

charts/midaz/Chart.yaml

@@ -17,10 +17,10 @@ maintainers:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 
-version: 4.4.8
+version: 4.5.0
 
 # This is the version number of the application being deployed.
-appVersion: "3.4.7"
+appVersion: "3.4.8"
 
 # A list of keywords about the chart. This helps others discover the chart.
 keywords:

charts/midaz/values.yaml

@@ -43,7 +43,7 @@ console:
     # -- Image pull policy
     pullPolicy: IfNotPresent
     # -- Image tag used for deployment
-    tag: "3.4.6"
+    tag: "3.4.8"
 
   # -- Secrets for pulling images from a private registry
   imagePullSecrets: []
@@ -237,7 +237,7 @@ onboarding:
     # -- Image pull policy
     pullPolicy: IfNotPresent
     # -- Image tag used for deployment
-    tag: "3.4.4"
+    tag: "3.4.8"
 
   # -- Secrets for pulling images from a private registry
   imagePullSecrets: []
@@ -437,7 +437,7 @@ transaction:
     # -- Image pull policy
     pullPolicy: IfNotPresent
     # -- Image tag used for deployment
-    tag: "3.4.7"
+    tag: "3.4.8"
 
   # -- Secrets for pulling images from a private registry
   imagePullSecrets: []