update embedded files [CI SKIP]

This commit is contained in:
Brad Rydzewski 2019-04-19 08:09:55 -07:00
parent c2b692bf44
commit 5159feae9f
2 changed files with 11 additions and 9 deletions

View File

@ -135,3 +135,4 @@ set -x
git fetch ${FLAGS} origin +refs/tags/${DRONE_TAG}: git fetch ${FLAGS} origin +refs/tags/${DRONE_TAG}:
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
` `

View File

@ -34,16 +34,16 @@ if ($Env:PLUGIN_SKIP_VERIFY) {
$Env:GIT_SSL_NO_VERIFY = "true" $Env:GIT_SSL_NO_VERIFY = "true"
} }
if ($Env:DRONE_COMMIT_AUTHOR_NAME) { if ($Env:DRONE_COMMIT_AUTHOR_NAME -eq '' -or $Env:DRONE_COMMIT_AUTHOR_NAME -eq $null) {
$Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
} else {
$Env:GIT_AUTHOR_NAME = "drone" $Env:GIT_AUTHOR_NAME = "drone"
} else {
$Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME
} }
if ($Env:DRONE_COMMIT_AUTHOR_NAME) { if ($Env:DRONE_COMMIT_AUTHOR_EMAIL -eq '' -or $Env:DRONE_COMMIT_AUTHOR_EMAIL -eq $null) {
$Env:GIT_AUTHOR_NAME = $Env:DRONE_COMMIT_AUTHOR_NAME $Env:GIT_AUTHOR_EMAIL = 'drone@localhost'
} else { } else {
$Env:GIT_AUTHOR_NAME = 'drone@localhost' $Env:GIT_AUTHOR_EMAIL = $Env:DRONE_COMMIT_AUTHOR_EMAIL
} }
$Env:GIT_COMMITTER_NAME = $Env:GIT_AUTHOR_NAME $Env:GIT_COMMITTER_NAME = $Env:GIT_AUTHOR_NAME
@ -104,8 +104,8 @@ if (!(Test-Path .git)) {
git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:" git fetch $FLAGS origin "+refs/heads/${Env:DRONE_COMMIT_BRANCH}:"
git checkout $Env:DRONE_COMMIT_BRANCH git checkout $Env:DRONE_COMMIT_BRANCH
git fetch origin $Env:DRONE_COMMIT_REF: git fetch origin "${Env:DRONE_COMMIT_REF}:"
git rebase $Env:DRONE_COMMIT_SHA git merge $Env:DRONE_COMMIT_SHA
` `
// Contents of clone-tag.ps1 // Contents of clone-tag.ps1
@ -123,3 +123,4 @@ if (!(Test-Path .git)) {
git fetch $FLAGS origin "+refs/tags/${Env:DRONE_TAG}:" git fetch $FLAGS origin "+refs/tags/${Env:DRONE_TAG}:"
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
` `