From 606b56faeb066ede93d0d1be1752bb214c6b2c32 Mon Sep 17 00:00:00 2001
From: Dani Bodor <d.bodor@esciencecenter.nl>
Date: Wed, 17 Jul 2024 13:46:19 +0200
Subject: [PATCH] ci: fix action

---
 .github/workflows/release_github.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release_github.yml b/.github/workflows/release_github.yml
index 583e4d86..5e8ec4c3 100644
--- a/.github/workflows/release_github.yml
+++ b/.github/workflows/release_github.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Fail if main branch was selected
-        if: ${{ github.ref_name }} == 'main'
+        if: ${{ github.ref_name == 'main' }}
         run: |
           echo "Cannot release from main branch, please select valid release branch."
           exit 1
@@ -35,6 +35,8 @@ jobs:
         with:
           # token with admin priviliges to override brach protection on main and dev
           token: ${{ secrets.GH_RELEASE }}
+          ref: main
+          fetch-depth: 0
 
       - name: Configure git
         run: |
@@ -45,8 +47,8 @@ jobs:
       - name: Merge changes into main
         run: |
           git switch main
-          git merge ${{ github.ref_name }} --no-ff --no-commit
-          git merge --continue
+          git merge origin/${{ github.ref_name }} --no-ff --no-commit
+          git commit --no-edit
 
       - name: Bump version
         id: bump
@@ -84,6 +86,7 @@ jobs:
         with:
           # token with admin priviliges to override brach protection on main and dev
           token: ${{ secrets.GH_RELEASE }}
+          fetch-depth: 0
 
       - name: Configure git
         run: |