From 6ada8c9026e0560417ade5c788103f56d9588fd6 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 17 Dec 2023 19:41:35 +0100 Subject: [PATCH] ci: add user/email for merge [skip ci] --- get_repo.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/get_repo.sh b/get_repo.sh index 2ccdd1d..4ebd6fc 100755 --- 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)}' )-ci@not-real.com" + 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