Browse Source

ci: merge PR with main branch [skip ci]

Baptiste Augrain 1 year ago
parent
commit
ef4d13a0c6
1 changed files with 3 additions and 0 deletions
  1. 3 0
      get_repo.sh

+ 3 - 0
get_repo.sh

@@ -9,8 +9,11 @@ if [[ "${CI_BUILD}" != "no" ]]; then
 fi
 
 if [[ -n "${PULL_REQUEST_ID}" ]]; then
+  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
+
   git fetch origin "pull/${PULL_REQUEST_ID}/head"
   git checkout FETCH_HEAD
+  git merge "origin/${BRANCH_NAME}"
 fi
 
 if [[ -z "${RELEASE_VERSION}" ]]; then