From 7574d66f3da3edfb681f1d348041dde505adaa2b Mon Sep 17 00:00:00 2001
From: Romain Bioteau <romain.bioteau@bonitasoft.com>
Date: Fri, 31 May 2024 11:37:06 +0200
Subject: [PATCH] chore(updateVersion): merge ignoring conflicts

---
 .github/workflows/_reusable_update_version.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/_reusable_update_version.yml b/.github/workflows/_reusable_update_version.yml
index c9b31eb..7adac99 100644
--- a/.github/workflows/_reusable_update_version.yml
+++ b/.github/workflows/_reusable_update_version.yml
@@ -6,6 +6,9 @@ on:
       version:
         type: string
         required: true
+      merge-upstream-ignoring-conflicts:
+        type: boolean
+        default: false
     secrets:
       KSM_CONFIG:
         required: true
@@ -45,4 +48,12 @@ jobs:
       - name: Commit and push
         run: |
           git commit -a -m "chore(versioning): update version to ${{ inputs.version }}"
-          git push
\ No newline at end of file
+          git push
+
+  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