Skip to content

Commit da12577

Browse files
authored
Fix issues with AppVeyor yaml [skip ci] (#28)
1 parent 33e5de2 commit da12577

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

appveyor.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ init:
4242
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GitHubToken):[email protected]`n"
4343
- git config --global user.email "%GitHubUserEmail%"
4444
- git config --global user.name "%GitHubUserName%"
45-
- ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n \"Authorization\" = \"Basic $env:GitRestAuth\"\n \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/$env:APPVEYOR_REPO_NAME/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -match \"*[version update]*\")\n{\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n} }\n"
45+
- ps: "$headers = if($env:APPVEYOR_PULL_REQUEST_NUMBER){\n @{\n \"Authorization\" = \"Basic $env:GitRestAuth\"\n \"Content-type\" = \"application/json\"\n}\n\n$pr = Invoke-RestMethod -Uri \"https://api.github.com/repos/$env:APPVEYOR_REPO_NAME/pulls/$env:APPVEYOR_PULL_REQUEST_NUMBER\" -Headers $headers -Method GET\n\nif($pr.user.login -eq \"nfbot\" -and $pr.body -like \"*[version update]*\")\n{\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n} }\n"
4646
- ps: "if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq \"\")\n{\n \n if($env:APPVEYOR_REPO_COMMIT_AUTHOR -eq \"nfbot\" -and $env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -like \"*[version update]*\")\n {\n # commit was from nfbot AND it's taged as a [version update]\n # OK to skip AppVeyor build \n \"Version update only. Skipping build.\" | Write-Host -BackgroundColor White -ForegroundColor Blue\n Exit-AppveyorBuild\n }\n}"
4747

4848
install:
@@ -67,10 +67,6 @@ build_script:
6767
6868
msbuild source\nanoFramework.Hardware.Esp32.sln /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
6969
70-
artifacts:
71-
- path: '**\bin\Release\*.nupkg'
72-
name: Nuget_Packages
73-
7470
before_deploy:
7571
- ps: >-
7672
.\commit-assemblyinfo-changes.ps1

commit-assemblyinfo-changes.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else
1313
{
1414
# updated assembly info files
1515
git add "source\nanoFramework.Hardware.Esp32\Properties\AssemblyInfo.cs"
16-
git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2 [skip ci]" -m"[version update]"
16+
git commit -m "Update assembly info file for v$env:GitVersion_NuGetVersionV2" -m"[version update]"
1717
git push origin --porcelain -q > $null
1818

1919
'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline
@@ -63,7 +63,7 @@ if ($env:APPVEYOR_REPO_BRANCH -match "^dev*" -or $env:APPVEYOR_REPO_TAG -eq "tru
6363

6464
# commit changes
6565
git add -A 2>&1
66-
git commit -m"$commitMessage [skip ci]" -m"[version update]" -q
66+
git commit -m"$commitMessage" -m"[version update]" -q
6767
git push --set-upstream origin "$newBranch" --porcelain -q > $null
6868

6969
# start PR

0 commit comments

Comments
 (0)