indicate which AppVeyor project committed the props update
This commit is contained in:
Родитель
cc571a0dc6
Коммит
7139a74278
|
@ -11,8 +11,10 @@ environment:
|
|||
global:
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
SignClientUser: Tt9mySuspn9dHJOLKMoGxrNJvJbpBrWK44UI9Qc9+eNilYdoukHZ3jUF06pl2r60
|
||||
SignClientSecret: ZmCTr+SyfQtewSNsiB8OMISmQJp8RfjRSK0Dvg60iTQ=
|
||||
SignClientUser:
|
||||
secure: Tt9mySuspn9dHJOLKMoGxrNJvJbpBrWK44UI9Qc9+eNilYdoukHZ3jUF06pl2r60
|
||||
SignClientSecret:
|
||||
secure: ZmCTr+SyfQtewSNsiB8OMISmQJp8RfjRSK0Dvg60iTQ=
|
||||
install:
|
||||
- git clone https://github.com/SteeltoeOSS/steeltoe-ci.git -v
|
||||
- ps: steeltoe-ci\scripts\appveyor_install.ps1
|
||||
|
|
|
@ -26,12 +26,14 @@ ForEach ($_ in $env:SteeltoeRepositoryList.Split(' ')) {
|
|||
Invoke-Expression $cloneString
|
||||
}
|
||||
Else {
|
||||
Write-Host "$_ found on disk"
|
||||
Write-Host "$_ found on disk, pulling latest"
|
||||
}
|
||||
|
||||
Set-Location $_.Split("/")[1]
|
||||
# make sure the destination branch is checked out
|
||||
Invoke-Expression "git checkout $destination"
|
||||
# be current
|
||||
Invoke-Expression "git pull"
|
||||
# merge the changes
|
||||
Invoke-Expression "git merge $source"
|
||||
Set-Location ..
|
||||
|
|
|
@ -74,7 +74,7 @@ ForEach ($_ in $env:SteeltoeRepositoryList.Split(' ')) {
|
|||
$trimmed = $xmlContent.OuterXml -replace "(?s)`r`n\s*$"
|
||||
[system.io.file]::WriteAllText("$pwd/$propsFilePath", $trimmed)
|
||||
git add $propsFilePath
|
||||
git commit -m "Update versions-$env:APPVEYOR_REPO_BRANCH.props"
|
||||
git commit -m "Update versions-$env:APPVEYOR_REPO_BRANCH.props from $env:APPVEYOR_PROJECT_ID"
|
||||
if (-Not $waitedForMyGet) {
|
||||
Write-Host "Before we push this change, wait a bit for MyGet to index what we just published so the build we're about to trigger doesn't fail"
|
||||
Start-Sleep -s 30
|
||||
|
|
Загрузка…
Ссылка в новой задаче