Improvements on CI & CD

Signed-off-by: José Simões <[email protected]>

Author: josesimoes

appveyor.yml

@@ -1,10 +1,4 @@
-# configuration these branches
-branches:
-  only:
-    - master
-    - /dev.*/
-    - /release.*/
-    - /v.*/
+# configuration for all branches
 
 image: Visual Studio 2017
 
@@ -85,6 +79,11 @@ before_deploy:
       
       Push-AppveyorArtifact $env:APPVEYOR_BUILD_FOLDER\source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.$env:GitVersion_NuGetVersionV2.nupkg 
 
+after_deploy:
+# for this environment variable to work here it has to be set in AppVeyor UI
+- nuget push source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+- nuget push source\Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES\bin\Release\nanoFramework.Hardware.Esp32.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+
 # requires APPVEYOR_DISCORD_WEBHOOK_URL enviroment variable set with Discord webhook URL
 on_failure:
   - ps: |
@@ -122,6 +121,8 @@ for:
     draft: true
     prerelease: false
     force_update: true
+    on:
+      appveyor_repo_tag: false
 
 -
   branches:
@@ -139,11 +140,8 @@ for:
     draft: true
     prerelease: true
     force_update: true
-
-  after_deploy:
-  # for this environment variable to work here it has to be set in AppVeyor UI
-  - nuget push source\Nuget.nanoFramework.Hardware.Esp32\bin\Release\nanoFramework.Hardware.Esp32.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
-  - nuget push source\Nuget.nanoFramework.Hardware.Esp32.DELIVERABLES\bin\Release\nanoFramework.Hardware.Esp32.DELIVERABLES.%GitVersion_NuGetVersionV2%.nupkg %MyGetToken% -Source https://www.myget.org/F/nanoframework-dev/api/v2/package
+    on:
+      appveyor_repo_tag: false
 
 -
   branches:
@@ -166,3 +164,5 @@ for:
     draft: true
     prerelease: true
     force_update: true
+    on:
+      appveyor_repo_tag: false

commit-assemblyinfo-changes.ps1

@@ -1,7 +1,13 @@
-# only need to commit assembly info changes when build is NOT for a pull-request
-if ($env:appveyor_pull_request_number)
+# Copyright (c) 2018 The nanoFramework project contributors
+# See LICENSE file in the project root for full license information.
+
+# skip updating assembly info changes if build is a pull-request or not a tag (master OR release)
+if ($env:appveyor_pull_request_number -or
+    ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    $env:APPVEYOR_REPO_TAG -eq "true")
 {
-    'Skip committing assembly info changes as this is a PR build...' | Write-Host -ForegroundColor White
+    'Skip committing assembly info changes...' | Write-Host -ForegroundColor White
 }
 else
 {
@@ -12,6 +18,12 @@ else
 
     'Updated assembly info...' | Write-Host -ForegroundColor White -NoNewline
     'OK' | Write-Host -ForegroundColor Green
+}
+
+# update assembly info in nf-interpreter if we are in development branch or if this is tag (master OR release)
+if ($env:APPVEYOR_REPO_BRANCH -match "^dev*" -or $env:APPVEYOR_REPO_TAG -eq "true")
+{
+    'Updating assembly version in nf-interpreter...' | Write-Host -ForegroundColor White -NoNewline
 
     # clone nf-interpreter repo (only a shallow clone with last commit)
     git clone https://github.com/nanoframework/nf-interpreter -b develop --depth 1 -q
@@ -51,7 +63,7 @@ else
 
         # commit changes
         git add -A 2>&1
-        git commit -m"$commitMessage" -m"[version update]" -q
+        git commit -m"$commitMessage [skip ci]" -m"[version update]" -q
         git push --set-upstream origin "$newBranch" --porcelain -q > $null
 
         # start PR

generate-change-log.ps1

@@ -1,20 +1,33 @@
-# generate change log when build is NOT for a pull-request
-if ($env:appveyor_pull_request_number)
+# Copyright (c) 2018 The nanoFramework project contributors
+# See LICENSE file in the project root for full license information.
+
+# generate change log when build is NOT a pull-request or not a tag (master OR release)
+if ($env:appveyor_pull_request_number -or 
+    ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    ($env:APPVEYOR_REPO_BRANCH -match "^release*" -and $env:APPVEYOR_REPO_TAG -eq 'true') -or
+    $env:APPVEYOR_REPO_TAG -eq "true")
 {
-    'Skip change log processing as this is a PR build...' | Write-Host -ForegroundColor White
+    'Skip change log processing...' | Write-Host -ForegroundColor White
 }
 else
 {
     # need this to keep ruby happy
     md c:\tmp
 
-    # generate change log
-    # version includes commits
-    bundle exec github_changelog_generator --token $env:GitHubToken
+    if ($env:APPVEYOR_REPO_BRANCH -eq "master" -or $env:APPVEYOR_REPO_BRANCH -match "^release*")
+    {
+        # generate change log including future version
+        bundle exec github_changelog_generator --token $env:GitHubToken --future-release "v$env:GitVersion_MajorMinorPatch"
+    }
+    else 
+    {
+        # generate change log
+        # version includes commits
+        bundle exec github_changelog_generator --token $env:GitHubToken        
+    }
 
     # updated changelog and the updated assembly info files
     git add CHANGELOG.md
     git commit -m "Update CHANGELOG for v$env:GitVersion_NuGetVersionV2"
-    # need to wrap the git command bellow so it doesn't throw an error because of redirecting the output to stderr
-    git push origin --porcelain  | Write-Host
+    git push origin --porcelain -q > $null
 }