From 31db9470b389603d3305f7ca51962872612d5b7b Mon Sep 17 00:00:00 2001
From: Romain Bioteau <romain.bioteau@bonitasoft.com>
Date: Fri, 31 May 2024 14:19:16 +0200
Subject: [PATCH] chore(updateVersion): can't use reusable

---
 .../workflows/_reusable_update_version.yml    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/_reusable_update_version.yml b/.github/workflows/_reusable_update_version.yml
index 9332e0a..972cbc9 100644
--- a/.github/workflows/_reusable_update_version.yml
+++ b/.github/workflows/_reusable_update_version.yml
@@ -54,7 +54,27 @@ jobs:
   merge-upstream:
     needs: update-version
     if: ${{ inputs.merge-upstream-ignoring-conflicts }}
-    uses: bonitasoft/github-workflows/.github/workflows/_reusable_merge_upstream.yml@main
-    with:
-      ignore-conflicts: true
-    secrets: inherit
\ No newline at end of file
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Setup git
+        uses: bonitasoft/git-setup-action@v1
+        with:
+          keeper-secret-config: ${{ secrets.KSM_CONFIG }}
+
+      - name: Determine upstream branch
+        id: upstream-branch
+        run: echo "ref=${{ fromJson(vars.SUPPORTED_BRANCHES).upstream-branch[github.ref_name] }}" >> $GITHUB_OUTPUT
+
+      - name: Checkout upstream branch
+        uses: actions/checkout@v4
+        with:
+          repository: bonitasoft/bonita-super-admin-application
+          ref: ${{ steps.upstream-branch.outputs.ref }}
+          fetch-depth: 0
+          token: ${{ secrets.BONITA_CI_PAT }}
+
+      - name: Merge upstream branch
+        run: |
+           git config merge.ours.driver true
+           git merge origin/${{ github.ref_name }} -X ours  -m "chore(merge): ${{ github.ref_name }} into ${{ steps.upstream-branch.outputs.ref }}"
+           git push
\ No newline at end of file