mirror of
https://github.com/maxkratz/vscodium.git
synced 2024-09-16 16:28:11 +00:00
ci: add user/email for merge [skip ci]
This commit is contained in:
parent
1c424b6c05
commit
6ada8c9026
1 changed files with 3 additions and 1 deletions
|
@ -11,10 +11,12 @@ fi
|
||||||
if [[ -n "${PULL_REQUEST_ID}" ]]; then
|
if [[ -n "${PULL_REQUEST_ID}" ]]; then
|
||||||
BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
|
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 --unshallow
|
||||||
git fetch origin "pull/${PULL_REQUEST_ID}/head"
|
git fetch origin "pull/${PULL_REQUEST_ID}/head"
|
||||||
git checkout FETCH_HEAD
|
git checkout FETCH_HEAD
|
||||||
git merge --no-ff --no-commit "origin/${BRANCH_NAME}"
|
git merge --no-edit "origin/${BRANCH_NAME}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${RELEASE_VERSION}" ]]; then
|
if [[ -z "${RELEASE_VERSION}" ]]; then
|
||||||
|
|
Loading…
Reference in a new issue