From c89b3984afb4db6f6019352542e7ba01a1190939 Mon Sep 17 00:00:00 2001
From: Felipe Olmos <92923444+folmos-at-orange@users.noreply.github.com>
Date: Mon, 22 Jul 2024 13:16:11 +0200
Subject: [PATCH] Fix release workflow

---
 .github/workflows/release.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b58e4f25..9d1a4a63 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,6 +20,15 @@ jobs:
           fetch-depth: 0
       - name: Update "main" branch
         run: |-
+          # Set the git user
+          git config --global user.name "${{ github.triggering_actor }}"
+          git config --global user.email "khiops.team@orange.com"
+
+          # Fetch the dev branch
+          git fetch origin dev
+          git switch dev  # To activate the local copy
+          git switch main
+
           # Merge dev into main, tag the merge commit
           git merge --no-ff -m'Merge branch 'dev' for release ${{ inputs.version }}' dev
           git tag ${{ inputs.version }}