ci: add user/email for merge [skip ci]

VSCodium · Dec 17, 2023 · 6ada8c9 · 6ada8c9
1 parent 1c424b6
commit 6ada8c9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/get_repo.sh b/get_repo.sh
@@ -11,10 +11,12 @@ fi
 if [[ -n "${PULL_REQUEST_ID}" ]]; then
   BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
 
+  git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )[email protected]"
+  git config --global user.name "${GITHUB_USERNAME} CI"
   git fetch --unshallow
   git fetch origin "pull/${PULL_REQUEST_ID}/head"
   git checkout FETCH_HEAD
-  git merge --no-ff --no-commit "origin/${BRANCH_NAME}"
+  git merge --no-edit "origin/${BRANCH_NAME}"
 fi
 
 if [[ -z "${RELEASE_VERSION}" ]]; then